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

Merge pull request #6 from selmf/9.5.0_bugfixes

Browse Source 
9.5.0 bugfixes
This commit is contained in:
Luis Ángel San Martín 2018-05-31 18:14:41 +02:00 committed by GitHub
commit 4608c9bb03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
YACReader/main_window_viewer.cpp
View File

@ -1682,7 +1682,10 @@ void MainWindowViewer::decreasePageZoomLevel()
void MainWindowViewer::sendComic()
{
YACReaderLocalClient * client = new YACReaderLocalClient;
connect(client, &YACReaderLocalClient::finished, client, &YACReaderLocalClient::deleteLater);
currentComicDB.info.lastTimeOpened = QDateTime::currentMSecsSinceEpoch() / 1000;
viewer->updateComic(currentComicDB);
if (currentComicDB.info.currentPage == currentComicDB.info.numPages) {
@ -1692,15 +1695,12 @@ void MainWindowViewer::sendComic()
ComicDB & nextComic = siblingComics[currentIndex+1];
nextComic.info.hasBeenOpened = true;
int retries = 1;
while(!client->sendComicInfo(libraryId,currentComicDB,nextComic.id) && retries!=0)
while(!client->sendComicInfo(libraryId, currentComicDB, nextComic.id) && retries!=0)
retries--;
connect(client,SIGNAL(finished()),client,SLOT(deleteLater()));
}
} else {
int retries = 1;
while(!client->sendComicInfo(libraryId,currentComicDB) && retries!=0)
while(!client->sendComicInfo(libraryId, currentComicDB) && retries!=0)
retries--;
connect(client,SIGNAL(finished()),client,SLOT(deleteLater()));
}
//delete client;
}

4
YACReaderLibrary/comic_vine/sort_volume_comics.cpp
View File

@ -86,7 +86,7 @@ SortVolumeComics::SortVolumeComics(QWidget *parent) :
//rows actions
QAction * removeItemFromList = new QAction(tr("remove selected comics"),this);
QAction * restoreAllItems = new QAction(tr("restore all removed comics"),this);
QAction * restoreItems = new QAction(tr("restore removed comics"),this);
//QAction * restoreItems = new QAction(tr("restore removed comics"),this);
tableFiles->setContextMenuPolicy(Qt::ActionsContextMenu);
tableFiles->addAction(removeItemFromList);
@ -95,7 +95,7 @@ SortVolumeComics::SortVolumeComics(QWidget *parent) :
connect(removeItemFromList,SIGNAL(triggered()),this,SLOT(removeSelectedComics()));
connect(restoreAllItems,SIGNAL(triggered()),this,SLOT(restoreAllComics()));
connect(restoreItems,SIGNAL(triggered()),this,SLOT(showRemovedComicsSelector()));
//connect(restoreItems,SIGNAL(triggered()),this,SLOT(showRemovedComicsSelector()));
}
void SortVolumeComics::setData(QList<ComicDB> & comics, const QString &json, const QString &vID)

6
YACReaderLibrary/db/folder_model.cpp
View File

@ -823,7 +823,13 @@ void FolderModelProxy::setupFilteredModelData(QSqlQuery &sqlquery, FolderItem *p
//si el nodo es hijo de 1 y no hab<61>a sido previamente insertado como hijo, se a<>ade como tal
if(!parentPreviousInserted)
{
filteredItems.value(ROOT)->appendChild(item);
}
else
{
delete item;
}
}
}
}

28
YACReaderLibrary/server/lib/httpserver/httprequest.cpp
View File

@ -460,16 +460,23 @@ void HttpRequest::parseMultiPartFile()
else if (!fileName.isEmpty() && !fieldName.isEmpty())
{
// last field was a file
#ifdef SUPERVERBOSE
qDebug("HttpRequest: finishing writing to uploaded file");
#endif
uploadedFile->resize(uploadedFile->size()-2);
uploadedFile->flush();
uploadedFile->seek(0);
parameters.insert(fieldName,fileName);
qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data());
uploadedFiles.insert(fieldName,uploadedFile);
qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
if (uploadedFile)
{
#ifdef SUPERVERBOSE
qDebug("HttpRequest: finishing writing to uploaded file");
#endif
uploadedFile->resize(uploadedFile->size()-2);
uploadedFile->flush();
uploadedFile->seek(0);
parameters.insert(fieldName,fileName);
qDebug("HttpRequest: set parameter %s=%s",fieldName.data(),fileName.data());
uploadedFiles.insert(fieldName,uploadedFile);
qDebug("HttpRequest: uploaded file size is %i",(int) uploadedFile->size());
}
else
{
qWarning("HttpRequest: format error, unexpected end of file data");
}
}
if (line.contains(boundary+"--"))
{
@ -546,4 +553,3 @@ QHostAddress HttpRequest::getPeerAddress() const
{
return peerAddress;
}

2
YACReaderLibrary/server/lib/logging/filelogger.cpp
View File

@ -92,8 +92,8 @@ void FileLogger::write(const LogMessage* logMessage)
// Check for success
if (file->error())
{
close();
qWarning("Cannot write to log file %s: %s",qPrintable(fileName),qPrintable(file->errorString()));
close();
}
}

2
custom_widgets/yacreader_options_dialog.cpp
View File

@ -275,6 +275,8 @@ void YACReaderOptionsDialog::restoreOptions(QSettings * settings)
case 5:
flowType = Custom;
break;
default:
flowType = CoverFlowLike;
}