CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Revert all recent changes to NetAction and NetJob

Browse Source
This commit is contained in:
Petr Mrázek
2017-05-03 23:11:52 +02:00
parent 0efa714ba5
commit e76e6329cd
45 changed files with 356 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
api/logic/net/FileSink.cpp
View File

@ -17,10 +17,10 @@ FileSink::~FileSink()
// nil
};
Task::Status FileSink::init(QNetworkRequest& request)
JobStatus FileSink::init(QNetworkRequest& request)
{
auto result = initCache(request);
if(result != Task::Status::InProgress)
if(result != Job_InProgress)
{
return result;
}
@ -28,27 +28,27 @@ Task::Status FileSink::init(QNetworkRequest& request)
if (!FS::ensureFilePathExists(m_filename))
{
qCritical() << "Could not create folder for " + m_filename;
return Task::Status::Failed;
return Job_Failed;
}
wroteAnyData = false;
m_output_file.reset(new QSaveFile(m_filename));
if (!m_output_file->open(QIODevice::WriteOnly))
{
qCritical() << "Could not open " + m_filename + " for writing";
return Task::Status::Failed;
return Job_Failed;
}
if(initAllValidators(request))
return Task::Status::InProgress;
return Task::Status::Failed;
return Job_InProgress;
return Job_Failed;
}
Task::Status FileSink::initCache(QNetworkRequest &)
JobStatus FileSink::initCache(QNetworkRequest &)
{
return Task::Status::InProgress;
return Job_InProgress;
}
Task::Status FileSink::write(QByteArray& data)
JobStatus FileSink::write(QByteArray& data)
{
if (!writeAllValidators(data) || m_output_file->write(data) != data.size())
{
@ -56,20 +56,20 @@ Task::Status FileSink::write(QByteArray& data)
m_output_file->cancelWriting();
m_output_file.reset();
wroteAnyData = false;
return Task::Status::Failed;
return Job_Failed;
}
wroteAnyData = true;
return Task::Status::InProgress;
return Job_InProgress;
}
Task::Status FileSink::abort()
JobStatus FileSink::abort()
{
m_output_file->cancelWriting();
failAllValidators();
return Task::Status::Failed;
return Job_Failed;
}
Task::Status FileSink::finalize(QNetworkReply& reply)
JobStatus FileSink::finalize(QNetworkReply& reply)
{
// if we wrote any data to the save file, we try to commit the data to the real file.
if (wroteAnyData)
@ -77,13 +77,13 @@ Task::Status FileSink::finalize(QNetworkReply& reply)
// ask validators for data consistency
// we only do this for actual downloads, not 'your data is still the same' cache hits
if(!finalizeAllValidators(reply))
return Task::Status::Failed;
return Job_Failed;
// nothing went wrong...
if (!m_output_file->commit())
{
qCritical() << "Failed to commit changes to " << m_filename;
m_output_file->cancelWriting();
return Task::Status::Failed;
return Job_Failed;
}
}
// then get rid of the save file
@ -92,9 +92,9 @@ Task::Status FileSink::finalize(QNetworkReply& reply)
return finalizeCache(reply);
}
Task::Status FileSink::finalizeCache(QNetworkReply &)
JobStatus FileSink::finalizeCache(QNetworkReply &)
{
return Task::Status::Finished;
return Job_Finished;
}
bool FileSink::hasLocalData()