From b85e45d8621025aaed9f0e428e9611e73d0065d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sun, 17 Feb 2013 22:20:54 +0100 Subject: [PATCH] A?adido uso de downloadedComics --- CHANGELOG.txt | 3 ++- .../server/controllers/comiccontroller.cpp | 2 ++ .../server/controllers/foldercontroller.cpp | 11 +++++++---- .../server/lib/bfHttpServer/httpsession.cpp | 1 + release/server/docroot/images/Thumbs.db | Bin 11264 -> 0 bytes 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 release/server/docroot/images/Thumbs.db diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0478268b..6c0f65b9 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -13,4 +13,5 @@ InformationLabel se muestra ahora en la esquina superiror derecha. InformationLabel se muestra en 3 tamaños diferentes en función de la resolución Corregido bug que causaba que las marcas de cómic leído no se dibujasen adecuadamente. Se recuerda si se debe mostrar o no la "label" información. -Corregido bug que provocaba el fallo de YACReader al pasar muy rápido las páginas. \ No newline at end of file +Corregido bug que provocaba el fallo de YACReader al pasar muy rápido las páginas. +Añadida columna "Tamaño" a la lista de cómics en YACReaderLibrary \ No newline at end of file diff --git a/YACReaderLibrary/server/controllers/comiccontroller.cpp b/YACReaderLibrary/server/controllers/comiccontroller.cpp index ba09dd9f..79403fc2 100644 --- a/YACReaderLibrary/server/controllers/comiccontroller.cpp +++ b/YACReaderLibrary/server/controllers/comiccontroller.cpp @@ -40,6 +40,8 @@ void ComicController::service(HttpRequest& request, HttpResponse& response) ComicDB comic = mw->getComicInfo(libraryName, comicId); + session.setDownloadedComic(comic.info.hash); + Comic * comicFile = FactoryComic::newComic(libraries.value(libraryName)+comic.path); if(comicFile != NULL) diff --git a/YACReaderLibrary/server/controllers/foldercontroller.cpp b/YACReaderLibrary/server/controllers/foldercontroller.cpp index f0921309..e4b45abf 100644 --- a/YACReaderLibrary/server/controllers/foldercontroller.cpp +++ b/YACReaderLibrary/server/controllers/foldercontroller.cpp @@ -121,7 +121,8 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) //t.setVariable(QString("element%1.url").arg(i),"/library/"+libraryName+"/folder/"+QString("%1").arg(folderContent.at(i + (page*10))->id)); //t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id)); - t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QUrl::toPercentEncoding(libraryName)+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id))); + + t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QUrl::toPercentEncoding(libraryName)+"/folder/"+QString("%1/info").arg(folderContent.at(i + (page*elementsPerPage))->id))); } else { @@ -130,10 +131,12 @@ void FolderController::service(HttpRequest& request, HttpResponse& response) t.setVariable(QString("element%1.browse").arg(i),""); t.setVariable(QString("element%1.image.width").arg(i),"80px"); //t.setVariable(QString("element%1.downloadurl").arg(i),"/library/"+libraryName+"/comic/"+QString("%1").arg(comic->id)); - if(!session.isComicOnDevice(comic->info.hash)) - t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QUrl::toPercentEncoding(libraryName)+"/comic/"+QString("%1").arg(comic->id))); + if(!session.isComicOnDevice(comic->info.hash) && !session.isComicDownloaded(comic->info.hash)) + t.setVariable(QString("element%1.download").arg(i),QString("import").arg("/library/"+QUrl::toPercentEncoding(libraryName)+"/comic/"+QString("%1").arg(comic->id))); + else if (!session.isComicDownloaded(comic->info.hash)) + t.setVariable(QString("element%1.download").arg(i),QString("
imported
")); else - t.setVariable(QString("element%1.download").arg(i),QString("
imported
")); + t.setVariable(QString("element%1.download").arg(i),QString("
importing
")); //t.setVariable(QString("element%1.image.url").arg(i),"/images/f.png"); diff --git a/YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp b/YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp index 402d8af0..53a51a20 100644 --- a/YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp +++ b/YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp @@ -270,6 +270,7 @@ void HttpSession::setDeviceType(const QString & device) if(dataPtr) { dataPtr->yacreaderSessionData.comicsOnDevice.clear(); //TODO crear un método clear que limpie la sesión completamente + dataPtr->yacreaderSessionData.downloadedComics.clear(); dataPtr->yacreaderSessionData.device = device; } } diff --git a/release/server/docroot/images/Thumbs.db b/release/server/docroot/images/Thumbs.db deleted file mode 100644 index 687558271ec1ba1e6f190bb29b4a46fc41027cf8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11264 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 H&(ePZdli5$