diff --git a/YACReaderLibrary/headless/images.qrc b/YACReaderLibrary/headless/images.qrc
deleted file mode 100644
index 4d459557..00000000
--- a/YACReaderLibrary/headless/images.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
- ../../images/f_overlayed.png
- ../../images/f_overlayed_retina.png
-
-
diff --git a/YACReaderLibraryServer/YACReaderLibraryServer.pro b/YACReaderLibraryServer/YACReaderLibraryServer.pro
index fa5d0953..1e0df2cf 100644
--- a/YACReaderLibraryServer/YACReaderLibraryServer.pro
+++ b/YACReaderLibraryServer/YACReaderLibraryServer.pro
@@ -91,11 +91,10 @@ HEADERS += ../YACReaderLibrary/library_creator.h \
../common/http_worker.h \
../YACReaderLibrary/yacreader_libraries.h \
../YACReaderLibrary/comic_files_manager.h \
- ../YACReaderLibrary/headless/console_ui_library_creator.h
+ console_ui_library_creator.h
SOURCES += ../YACReaderLibrary/library_creator.cpp \
- ../YACReaderLibrary/headless\main.cpp \
../YACReaderLibrary/package_manager.cpp \
../YACReaderLibrary/bundle_creator.cpp \
../YACReaderLibrary/db_helper.cpp \
@@ -113,7 +112,9 @@ SOURCES += ../YACReaderLibrary/library_creator.cpp \
../common/yacreader_global.cpp \
../YACReaderLibrary/yacreader_libraries.cpp \
../YACReaderLibrary/comic_files_manager.cpp \
- ../YACReaderLibrary/headless/console_ui_library_creator.cpp
+ console_ui_library_creator.cpp \
+ main.cpp
+
include(../YACReaderLibrary/server/server.pri)
@@ -137,7 +138,7 @@ TRANSLATIONS = yacreaderlibraryserver_es.ts \
yacreaderlibraryserver_source.ts
-RESOURCES += ../YACReaderLibrary/headless/images.qrc
+RESOURCES += images.qrc
Release:DESTDIR = ../release
diff --git a/YACReaderLibrary/headless/console_ui_library_creator.cpp b/YACReaderLibraryServer/console_ui_library_creator.cpp
similarity index 72%
rename from YACReaderLibrary/headless/console_ui_library_creator.cpp
rename to YACReaderLibraryServer/console_ui_library_creator.cpp
index aa133c6f..876e6992 100644
--- a/YACReaderLibrary/headless/console_ui_library_creator.cpp
+++ b/YACReaderLibraryServer/console_ui_library_creator.cpp
@@ -18,7 +18,21 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
LibraryCreator * libraryCreator = new LibraryCreator();
QDir pathDir(path);
+ if (!pathDir.exists())
+ {
+ std::cout << "Directory not found." << std::endl;
+ return;
+ }
+
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
+
+ YACReaderLibraries yacreaderLibraries;
+ yacreaderLibraries.load();
+ if (yacreaderLibraries.contains(name))
+ {
+ std::cout << "A Library named \"" << name.toUtf8().constData() << "\" already exists in database." << std::endl;
+ return;
+ }
libraryCreator->createLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
@@ -33,9 +47,6 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
libraryCreator->start();
eventLoop.exec();
- //TODO, at some point some checking is needed for avoiding duplicated libraries
- YACReaderLibraries yacreaderLibraries;
- yacreaderLibraries.load();
yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save();
}
@@ -46,6 +57,11 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
LibraryCreator * libraryCreator = new LibraryCreator();
QDir pathDir(path);
+ if (!pathDir.exists())
+ {
+ std::cout << "Directory not found." << std::endl;
+ return;
+ }
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
libraryCreator->updateLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
@@ -65,11 +81,26 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QString & path)
{
QDir pathDir(path);
+ if (!pathDir.exists())
+ {
+ std::cout << "Directory not found." << std::endl;
+ return;
+ }
QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
+
+ if (!QDir(cleanPath + "/.yacreaderlibrary").exists())
+ {
+ std::cout << "No library database found in directory." << std::endl;
+ return;
+ }
- //TODO add error handling
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
+ if (yacreaderLibraries.contains(name))
+ {
+ std::cout << "A Library named \"" << name.toUtf8().constData() << "\" already exists in the database." << std::endl;
+ return;
+ }
yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save();
@@ -81,6 +112,11 @@ void ConsoleUILibraryCreator::removeLibrary(const QString & name)
//TODO add error handling
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
+ if (!yacreaderLibraries.contains(name))
+ {
+ std::cout << "No Library named \"" << name.toUtf8().constData() << "\" in database." << std::endl;
+ return;
+ }
yacreaderLibraries.remove(name);
yacreaderLibraries.save();
@@ -95,12 +131,12 @@ void ConsoleUILibraryCreator::newComic(const QString & /*relativeComicPath*/, co
void ConsoleUILibraryCreator::manageCreatingError(const QString & error)
{
- std::cout << std::endl << "Error creating library! " << error.toUtf8().constData();
+ std::cout << std::endl << "Error creating library! " << error.toUtf8().constData() << std::endl;
}
void ConsoleUILibraryCreator::manageUpdatingError(const QString & error)
{
- std::cout << std::endl << "Error updating library! " << error.toUtf8().constData();
+ std::cout << std::endl << "Error updating library! " << error.toUtf8().constData() << std::endl;
}
void ConsoleUILibraryCreator::done()
@@ -108,5 +144,5 @@ void ConsoleUILibraryCreator::done()
std::cout << "Done!" << std::endl;
if(numComicsProcessed > 0)
- std::cout << "Number of comis processed = " << numComicsProcessed << std::endl;
+ std::cout << "Number of comics processed = " << numComicsProcessed << std::endl;
}
diff --git a/YACReaderLibrary/headless/console_ui_library_creator.h b/YACReaderLibraryServer/console_ui_library_creator.h
similarity index 100%
rename from YACReaderLibrary/headless/console_ui_library_creator.h
rename to YACReaderLibraryServer/console_ui_library_creator.h
diff --git a/YACReaderLibraryServer/images.qrc b/YACReaderLibraryServer/images.qrc
new file mode 100644
index 00000000..1ea3a08e
--- /dev/null
+++ b/YACReaderLibraryServer/images.qrc
@@ -0,0 +1,6 @@
+
+
+ ../images/f_overlayed.png
+ ../images/f_overlayed_retina.png
+
+
diff --git a/YACReaderLibrary/headless/main.cpp b/YACReaderLibraryServer/main.cpp
similarity index 100%
rename from YACReaderLibrary/headless/main.cpp
rename to YACReaderLibraryServer/main.cpp
diff --git a/compressed_archive/unarr/unarr.pro b/compressed_archive/unarr/unarr.pro
index 94167d62..d23c3c19 100644
--- a/compressed_archive/unarr/unarr.pro
+++ b/compressed_archive/unarr/unarr.pro
@@ -1,26 +1,21 @@
INCLUDEPATH += $$PWD/unarr-master/
DEPENDPATH += $$PWD/unarr-master/
+unix:QMAKE_CFLAGS_RELEASE -= "-O2"
+unix:QMAKE_CFLAGS_RELEASE += "-O3"
+unix:QMAKE_CFLAGS_RELEASE += "-DNDEBUG"
+unix:QMAKE_CFLAGS += "-D_FILE_OFFSET_BITS=64"
+
+win32:QMAKE_CFLAGS_RELEASE += "/DNDEBUG"
+
HEADERS+=$$PWD/unarr-master/common/allocator.h\
$$PWD/unarr-master/common/unarr-imp.h\
- $$PWD/unarr-master/lzmasdk/CpuArch.h\
- $$PWD/unarr-master/lzmasdk/Ppmd7.h\
- $$PWD/unarr-master/lzmasdk/Ppmd.h\
- $$PWD/unarr-master/lzmasdk/LzmaDec.h\
- $$PWD/unarr-master/lzmasdk/Ppmd8.h\
- $$PWD/unarr-master/lzmasdk/Types.h\
- $$PWD/unarr-master/lzmasdk/CpuArch.h\
- $$PWD/unarr-master/lzmasdk/Ppmd7.h\
- $$PWD/unarr-master/lzmasdk/Ppmd.h\
- $$PWD/unarr-master/lzmasdk/LzmaDec.h\
- $$PWD/unarr-master/lzmasdk/Ppmd8.h\
- $$PWD/unarr-master/lzmasdk/Types.h\
- $$PWD/unarr-master/lzmasdk/CpuArch.h\
- $$PWD/unarr-master/lzmasdk/Ppmd7.h\
- $$PWD/unarr-master/lzmasdk/Ppmd.h\
- $$PWD/unarr-master/lzmasdk/LzmaDec.h\
- $$PWD/unarr-master/lzmasdk/Ppmd8.h\
$$PWD/unarr-master/lzmasdk/7zTypes.h\
+ $$PWD/unarr-master/lzmasdk/CpuArch.h\
+ $$PWD/unarr-master/lzmasdk/Ppmd7.h\
+ $$PWD/unarr-master/lzmasdk/Ppmd.h\
+ $$PWD/unarr-master/lzmasdk/LzmaDec.h\
+ $$PWD/unarr-master/lzmasdk/Ppmd8.h\
$$PWD/unarr-master/tar/tar.h\
$$PWD/unarr-master/_7z/_7z.h\
$$PWD/unarr-master/unarr.h