Browse Source

- Fixed v1.4.x torrent import

adaptive-webui-19844
Christophe Dumez 15 years ago
parent
commit
e2dc2207d8
  1. 30
      src/bittorrent.cpp
  2. 2
      src/src.pro

30
src/bittorrent.cpp

@ -757,7 +757,20 @@ void bittorrent::importOldTorrents() { @@ -757,7 +757,20 @@ void bittorrent::importOldTorrents() {
QPair<int, QString> fileName;
foreach(fileName, filePaths) {
importOldTempData(fileName.second);
addTorrent(fileName.second, false, QString(), true);
QTorrentHandle h = addTorrent(fileName.second, false, QString(), true);
// Sequential download
if(TorrentTempData::hasTempData(h.hash())) {
qDebug("addTorrent: Setting download as sequential (from tmp data)");
h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
}
QString savePath = TorrentTempData::getSavePath(h.hash());
// Save persistent data for new torrent
TorrentPersistentData::saveTorrentPersistentData(h);
// Save save_path
if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
TorrentPersistentData::saveSavePath(h.hash(), savePath);
}
}
} else {
QStringList filePaths;
@ -767,7 +780,20 @@ void bittorrent::importOldTorrents() { @@ -767,7 +780,20 @@ void bittorrent::importOldTorrents() {
// Resume downloads
foreach(const QString &fileName, filePaths) {
importOldTempData(fileName);
addTorrent(fileName, false, QString(), true);
QTorrentHandle h = addTorrent(fileName, false, QString(), true);
// Sequential download
if(TorrentTempData::hasTempData(h.hash())) {
qDebug("addTorrent: Setting download as sequential (from tmp data)");
h.set_sequential_download(TorrentTempData::isSequential(h.hash()));
}
QString savePath = TorrentTempData::getSavePath(h.hash());
// Save persistent data for new torrent
TorrentPersistentData::saveTorrentPersistentData(h);
// Save save_path
if(!defaultTempPath.isEmpty() && !savePath.isNull()) {
qDebug("addTorrent: Saving save_path in persistent data: %s", savePath.toLocal8Bit().data());
TorrentPersistentData::saveSavePath(h.hash(), savePath);
}
}
}
settings.setValue("v1_4_x_torrent_imported", true);

2
src/src.pro

@ -14,7 +14,7 @@ CONFIG += qt \ @@ -14,7 +14,7 @@ CONFIG += qt \
network
# Update this VERSION for each release
DEFINES += VERSION=\\\"v1.5.0rc1\\\"
DEFINES += VERSION=\\\"v1.5.0rc2\\\"
DEFINES += VERSION_MAJOR=1
DEFINES += VERSION_MINOR=5
DEFINES += VERSION_BUGFIX=0

Loading…
Cancel
Save