mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add checks for directories and library names

Browse Source
This commit is contained in:
Felix Kauselmann 2016-11-27 16:18:09 +01:00
parent c48df74d53
commit 344a71b072
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
YACReaderLibraryServer/console_ui_library_creator.cpp
View File

@ -18,7 +18,21 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
LibraryCreator * libraryCreator = new LibraryCreator(); LibraryCreator * libraryCreator = new LibraryCreator();
QDir pathDir(path); QDir pathDir(path);
if (!pathDir.exists())
{
manageCreatingError(QString("Directory not found.") );
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath()); QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
if (yacreaderLibraries.getNames().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")); libraryCreator->createLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary"));
@ -33,9 +47,6 @@ void ConsoleUILibraryCreator::createLibrary(const QString & name, const QString
libraryCreator->start(); libraryCreator->start();
eventLoop.exec(); eventLoop.exec();
//TODO, at some point some checking is needed for avoiding duplicated libraries
YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load();
yacreaderLibraries.addLibrary(name, cleanPath); yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save(); yacreaderLibraries.save();
} }
@ -46,6 +57,11 @@ void ConsoleUILibraryCreator::updateLibrary(const QString & path)
LibraryCreator * libraryCreator = new LibraryCreator(); LibraryCreator * libraryCreator = new LibraryCreator();
QDir pathDir(path); QDir pathDir(path);
if (!pathDir.exists())
{
manageCreatingError(QString("Directory not found.") );
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath()); QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
libraryCreator->updateLibrary(cleanPath,QDir::cleanPath(pathDir.absolutePath()+"/.yacreaderlibrary")); 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) void ConsoleUILibraryCreator::addExistingLibrary(const QString & name, const QString & path)
{ {
QDir pathDir(path); QDir pathDir(path);
if (!pathDir.exists())
{
manageCreatingError(QString("Directory not found."));
return;
}
QString cleanPath = QDir::cleanPath(pathDir.absolutePath()); QString cleanPath = QDir::cleanPath(pathDir.absolutePath());
if (!QDir(cleanPath + "/.yacreaderlibrary").exists())
{
manageCreatingError(QString("No library database found in directory."));
return;
}
//TODO add error handling
YACReaderLibraries yacreaderLibraries; YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load(); yacreaderLibraries.load();
if (yacreaderLibraries.getNames().contains(name))
{
std::cout << "A Library named \"" << name.toUtf8().constData() << "\" already exists in the database." << std::endl;
return;
}
yacreaderLibraries.addLibrary(name, cleanPath); yacreaderLibraries.addLibrary(name, cleanPath);
yacreaderLibraries.save(); yacreaderLibraries.save();
@ -81,6 +112,11 @@ void ConsoleUILibraryCreator::removeLibrary(const QString & name)
//TODO add error handling //TODO add error handling
YACReaderLibraries yacreaderLibraries; YACReaderLibraries yacreaderLibraries;
yacreaderLibraries.load(); yacreaderLibraries.load();
if (!yacreaderLibraries.getNames().contains(name))
{
std::cout << "No Library named \"" << name.toUtf8().constData() << "\" in database." << std::endl;
return;
}
yacreaderLibraries.remove(name); yacreaderLibraries.remove(name);
yacreaderLibraries.save(); yacreaderLibraries.save();