mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merged

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-03-22 17:53:51 +01:00
commit cdcbba5991
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
YACReaderLibrary/db_helper.cpp
View File

@ -43,15 +43,20 @@ QList<LibraryItem *> DBHelper::getFolderSubfoldersFromLibrary(qulonglong library
return list; return list;
} }
QList<LibraryItem *> DBHelper::getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId) QList<LibraryItem *> DBHelper::getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId)
{
return DBHelper::getFolderComicsFromLibrary(libraryId, folderId, false);
}
QList<LibraryItem *> DBHelper::getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId, bool sort)
{ {
QString libraryPath = DBHelper::getLibraries().getPath(libraryId); QString libraryPath = DBHelper::getLibraries().getPath(libraryId);
QSqlDatabase db = DataBaseManagement::loadDatabase(libraryPath+"/.yacreaderlibrary"); QSqlDatabase db = DataBaseManagement::loadDatabase(libraryPath+"/.yacreaderlibrary");
QList<LibraryItem *> list = DBHelper::getComicsFromParent(folderId,db,false); QList<LibraryItem *> list = DBHelper::getComicsFromParent(folderId,db,sort);
db.close(); db.close();
QSqlDatabase::removeDatabase(libraryPath); QSqlDatabase::removeDatabase(libraryPath);
return list; return list;
} }
qulonglong DBHelper::getParentFromComicFolderId(qulonglong libraryId, qulonglong id) qulonglong DBHelper::getParentFromComicFolderId(qulonglong libraryId, qulonglong id)
{ {

1
YACReaderLibrary/db_helper.h
View File

@ -22,6 +22,7 @@ public:
static YACReaderLibraries getLibraries(); static YACReaderLibraries getLibraries();
static QList<LibraryItem *> getFolderSubfoldersFromLibrary(qulonglong libraryId, qulonglong folderId); static QList<LibraryItem *> getFolderSubfoldersFromLibrary(qulonglong libraryId, qulonglong folderId);
static QList<LibraryItem *> getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId); static QList<LibraryItem *> getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId);
static QList<LibraryItem *> getFolderComicsFromLibrary(qulonglong libraryId, qulonglong folderId, bool sort);
static qulonglong getParentFromComicFolderId(qulonglong libraryId, qulonglong id); static qulonglong getParentFromComicFolderId(qulonglong libraryId, qulonglong id);
static ComicDB getComicInfo(qulonglong libraryId, qulonglong id); static ComicDB getComicInfo(qulonglong libraryId, qulonglong id);
static QList<ComicDB> getSiblings(qulonglong libraryId, qulonglong parentId); static QList<ComicDB> getSiblings(qulonglong libraryId, qulonglong parentId);

2
YACReaderLibrary/server/controllers/comiccontroller.cpp
View File

@ -82,7 +82,7 @@ void ComicController::service(HttpRequest& request, HttpResponse& response)
response.writeText(QString("libraryId:%1\r\n").arg(libraryId)); response.writeText(QString("libraryId:%1\r\n").arg(libraryId));
if(remoteComic) //send previous and next comics id if(remoteComic) //send previous and next comics id
{ {
QList<LibraryItem *> siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId); QList<LibraryItem *> siblings = DBHelper::getFolderComicsFromLibrary(libraryId, comic.parentId, true);
bool found = false; bool found = false;
int i; int i;
for(i = 0; i < siblings.length(); i++) for(i = 0; i < siblings.length(); i++)

8
YACReaderLibrary/server_config_dialog.cpp
View File

@ -13,12 +13,16 @@
#include "startup.h" #include "startup.h"
#include "yacreader_global.h" #include "yacreader_global.h"
#include "qnaturalsorting.h"
#include <algorithm> #include <algorithm>
//192.168 (most comon local subnet for ips are always put first)
//IPs are sorted using natoral sorting
bool ipComparator(const QString & ip1, const QString & ip2) bool ipComparator(const QString & ip1, const QString & ip2)
{ {
if(ip1.startsWith("192.168") && ip2.startsWith("192.168")) if(ip1.startsWith("192.168") && ip2.startsWith("192.168"))
return ip1 < ip2; return naturalSortLessThanCI(ip1, ip2);
if(ip1.startsWith("192.168")) if(ip1.startsWith("192.168"))
return true; return true;
@ -26,7 +30,7 @@ bool ipComparator(const QString & ip1, const QString & ip2)
if(ip2.startsWith("192.168")) if(ip2.startsWith("192.168"))
return false; return false;
return ip1 < ip2; return naturalSortLessThanCI(ip1, ip2);
} }
#ifndef Q_OS_WIN32 #ifndef Q_OS_WIN32