mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-26 00:44:59 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed simultaneously importing and remote reading

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-07-30 21:56:34 +02:00
parent 848382cc6c
commit 3c6c237e5c
6 changed files with 113 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
YACReaderLibrary/server/lib/bfHttpServer/httpsession.cpp
View File

@ -16,6 +16,8 @@ HttpSession::HttpSession(bool canStore) {
dataPtr->id=QUuid::createUuid().toString().toLatin1();
dataPtr->yacreaderSessionData.comic = 0;
dataPtr->yacreaderSessionData.comicId = 0;
dataPtr->yacreaderSessionData.remoteComic = 0;
dataPtr->yacreaderSessionData.remoteComicId = 0;
#ifdef SUPERVERBOSE
qDebug("HttpSession: created new session data with id %s",dataPtr->id.data());
#endif
@ -210,7 +212,7 @@ QSet<QString> HttpSession::getDownloadedComics()
else
return QSet<QString>();
}
//current comic
//current comic (import)
qulonglong HttpSession::getCurrentComicId()
{
if(dataPtr)
@ -249,6 +251,46 @@ void HttpSession::setCurrentComic(qulonglong id, Comic * comic)
}
}
//current comic (read)
qulonglong HttpSession::getCurrentRemoteComicId()
{
if(dataPtr)
return dataPtr->yacreaderSessionData.remoteComicId ;
else
return 0;
}
Comic* HttpSession::getCurrentRemoteComic()
{
if(dataPtr)
{
return dataPtr->yacreaderSessionData.remoteComic ;
}
else
return 0;
}
void HttpSession::dismissCurrentRemoteComic()
{
if(dataPtr)
{
if(dataPtr->yacreaderSessionData.remoteComic != 0)
{
dataPtr->yacreaderSessionData.remoteComic->deleteLater();
dataPtr->yacreaderSessionData.remoteComic = 0;
}
dataPtr->yacreaderSessionData.remoteComicId = 0;
}
}
void HttpSession::setCurrentRemoteComic(qulonglong id, Comic * comic)
{
if(dataPtr)
{
dismissCurrentRemoteComic();
dataPtr->yacreaderSessionData.remoteComicId = id;
dataPtr->yacreaderSessionData.remoteComic = comic;
}
}
QString HttpSession::getDeviceType()
{
if(dataPtr)
@ -269,8 +311,8 @@ void HttpSession::setDeviceType(const QString & device)
{
if(dataPtr)
{
dataPtr->yacreaderSessionData.comicsOnDevice.clear(); //TODO crear un m<>todo clear que limpie la sesi<73>n completamente
dataPtr->yacreaderSessionData.downloadedComics.clear();
//dataPtr->yacreaderSessionData.comicsOnDevice.clear(); //TODO crear un m<>todo clear que limpie la sesi<73>n completamente
//dataPtr->yacreaderSessionData.downloadedComics.clear();
dataPtr->yacreaderSessionData.device = device;
}
}

10
YACReaderLibrary/server/lib/bfHttpServer/httpsession.h
View File

@ -102,11 +102,17 @@ public:
QSet<QString> getComicsOnDevice();
QSet<QString> getDownloadedComics();
//current comic
//current comic (import)
qulonglong getCurrentComicId();
Comic * getCurrentComic();
void dismissCurrentComic();
void setCurrentComic(qulonglong id, Comic * comic);
//current comic (read)
qulonglong getCurrentRemoteComicId();
Comic * getCurrentRemoteComic();
void dismissCurrentRemoteComic();
void setCurrentRemoteComic(qulonglong id, Comic * comic);
//device identification
QString getDeviceType();
@ -136,11 +142,13 @@ private:
QString device;
QString display;
qulonglong comicId;
qulonglong remoteComicId;
QStack<int> navigationPath;
QStack<int> foldersPath;
Comic * comic;
Comic * remoteComic;
};
struct HttpSessionData {