squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2026-01-06 23:52:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Refactor TorrentPersistentData

Browse Source 
Conflicts:
	src/mainwindow.cpp
	src/mainwindow.h
	src/qtlibtorrent/qbtsession.cpp
	src/qtlibtorrent/qtorrenthandle.cpp
	src/transferlistwidget.cpp
	src/webui/btjson.cpp
This commit is contained in:
Ivan Sorokin
2014-11-02 16:52:26 +03:00
parent 70a114eb13
commit e3349092ad
10 changed files with 157 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/qtlibtorrent/qtorrenthandle.cpp
View File

@@ -86,7 +86,7 @@ QString QTorrentHandle::hash() const
QString QTorrentHandle::name() const
{
QString name = TorrentPersistentData::getName(hash());
QString name = TorrentPersistentData::instance().getName(hash());
if (name.isEmpty()) {
#if LIBTORRENT_VERSION_NUM < 10000
name = misc::toQStringU(torrent_handle::name());
@@ -201,7 +201,7 @@ QString QTorrentHandle::save_path_parsed() const
p = firstFileSavePath();
}
else {
p = fsutils::fromNativePath(TorrentPersistentData::getSavePath(hash()));
p = fsutils::fromNativePath(TorrentPersistentData::instance().getSavePath(hash()));
if (p.isEmpty())
p = save_path();
}
@@ -386,7 +386,7 @@ bool QTorrentHandle::priv() const
QString QTorrentHandle::firstFileSavePath() const
{
Q_ASSERT(has_metadata());
QString fsave_path = fsutils::fromNativePath(TorrentPersistentData::getSavePath(hash()));
QString fsave_path = fsutils::fromNativePath(TorrentPersistentData::instance().getSavePath(hash()));
if (fsave_path.isEmpty())
fsave_path = save_path();
if (!fsave_path.endsWith("/"))
@@ -520,13 +520,13 @@ void QTorrentHandle::resume() const
torrent_handle::clear_error();
const QString torrent_hash = hash();
bool has_persistant_error = TorrentPersistentData::hasError(torrent_hash);
TorrentPersistentData::setErrorState(torrent_hash, false);
bool has_persistant_error = TorrentPersistentData::instance().hasError(torrent_hash);
TorrentPersistentData::instance().setErrorState(torrent_hash, false);
bool temp_path_enabled = Preferences::instance()->isTempPathEnabled();
if (has_persistant_error && temp_path_enabled) {
// Torrent was supposed to be seeding, checking again in final destination
qDebug("Resuming a torrent with error...");
const QString final_save_path = TorrentPersistentData::getSavePath(torrent_hash);
const QString final_save_path = TorrentPersistentData::instance().getSavePath(torrent_hash);
qDebug("Torrent final path is: %s", qPrintable(final_save_path));
if (!final_save_path.isEmpty())
move_storage(final_save_path);
@@ -691,7 +691,7 @@ void QTorrentHandle::prioritize_files(const vector<int> &files) const
if (was_seed && !is_seed()) {
qDebug() << "Torrent is no longer SEEDING";
// Save seed status
TorrentPersistentData::saveSeedStatus(*this);
TorrentPersistentData::instance().saveSeedStatus(*this);
// Move to temp folder if necessary
const Preferences* const pref = Preferences::instance();
if (pref->isTempPathEnabled()) {