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

fixed libraries paths in YACReaderLibraryServer

Browse Source
This commit is contained in:
Luis Ángel San Martín 2016-05-21 21:11:04 +02:00
parent d011ea2586
commit 3b08264f6a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
YACReaderLibrary/headless/console_ui_library_creator.cpp
View File

@ -17,7 +17,10 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
QEventLoop eventLoop; QEventLoop eventLoop;
LibraryCreator * libraryCreator = new LibraryCreator(); LibraryCreator * libraryCreator = new LibraryCreator();
libraryCreator->createLibrary(QDir::cleanPath(path),QDir::cleanPath(path)+"/.yacreaderlibrary"); QDir pathDir(path);
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
libraryCreator->createLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done); connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done);
connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic); connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic);
@ -33,7 +36,7 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
//TODO, at some point some checking is needed for avoiding duplicated libraries //TODO, at some point some checking is needed for avoiding duplicated libraries
YACReaderLibraries yacreaderLibraries; YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load(); yacreaderLibraries.load();
yacreaderLibraries.addLibrary(name, path); yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save(); yacreaderLibraries.save();
} }
@ -42,7 +45,10 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
QEventLoop eventLoop; QEventLoop eventLoop;
LibraryCreator * libraryCreator = new LibraryCreator(); LibraryCreator * libraryCreator = new LibraryCreator();
libraryCreator->updateLibrary(QDir::cleanPath(path),QDir::cleanPath(path)+"/.yacreaderlibrary"); QDir pathDir(path);
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
libraryCreator->updateLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done); connect(libraryCreator, &LibraryCreator::finished, this, &ConsoleUILibraryCreator::done);
connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic); connect(libraryCreator, &LibraryCreator::comicAdded, this, &ConsoleUILibraryCreator::newComic);
@ -58,13 +64,16 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QString & path) void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QString & path)
{ {
QDir pathDir(path);
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
//TODO add error handling //TODO add error handling
YACReaderLibraries yacreaderLibraries; YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load(); yacreaderLibraries.load();
yacreaderLibraries.addLibrary(name, path); yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save(); yacreaderLibraries.save();
std::cout << "Library added : " << name.toUtf8().constData() << " at " << path.toUtf8().constData() << std::endl; std::cout << "Library added : " << name.toUtf8().constData() << " at " << cleanPath.toUtf8().constData() << std::endl;
} }
void ConsoleUILibraryCreator::removeLibrary(const QString & name) void ConsoleUILibraryCreator::removeLibrary(const QString & name)