mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-20 15:37:26 -06:00
Fix properties display for torrents without metadata
This commit is contained in:
Christophe Dumez
@@ -63,7 +63,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
PropertiesWidget::PropertiesWidget(QWidget *parent, GUI* main_window, TransferListWidget *transferList, Bittorrent* BTSession):
|
PropertiesWidget::PropertiesWidget(QWidget *parent, GUI* main_window, TransferListWidget *transferList, Bittorrent* BTSession):
|
||||||
QWidget(parent), transferList(transferList), main_window(main_window), BTSession(BTSession) {
|
QWidget(parent), transferList(transferList), main_window(main_window), BTSession(BTSession) {
|
||||||
setupUi(this);
|
setupUi(this);
|
||||||
state = VISIBLE;
|
state = VISIBLE;
|
||||||
setEnabled(false);
|
setEnabled(false);
|
||||||
@@ -237,30 +237,34 @@ void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) {
|
|||||||
clear();
|
clear();
|
||||||
h = _h;
|
h = _h;
|
||||||
if(!h.is_valid()) {
|
if(!h.is_valid()) {
|
||||||
|
qDebug("Properties: invalid handle, returning.");
|
||||||
clear();
|
clear();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
setEnabled(true);
|
setEnabled(true);
|
||||||
|
|
||||||
|
PropListModel->clear();
|
||||||
try {
|
try {
|
||||||
// Save path
|
// Save path
|
||||||
updateSavePath(h);
|
updateSavePath(h);
|
||||||
changeSavePathButton->setEnabled(h.has_metadata());
|
changeSavePathButton->setEnabled(h.has_metadata());
|
||||||
// Creation date
|
|
||||||
lbl_creationDate->setText(h.creation_date());
|
|
||||||
// Hash
|
// Hash
|
||||||
hash_lbl->setText(h.hash());
|
hash_lbl->setText(h.hash());
|
||||||
// Comment
|
if(h.has_metadata()) {
|
||||||
comment_text->setHtml(h.comment());
|
// Creation date
|
||||||
// URL seeds
|
lbl_creationDate->setText(h.creation_date());
|
||||||
loadUrlSeeds();
|
// Comment
|
||||||
// List files in torrent
|
comment_text->setHtml(h.comment());
|
||||||
PropListModel->clear();
|
// URL seeds
|
||||||
PropListModel->setupModelData(h.get_torrent_info());
|
loadUrlSeeds();
|
||||||
// Expand first item if possible
|
// List files in torrent
|
||||||
filesList->expand(PropListModel->index(0, 0));
|
PropListModel->setupModelData(h.get_torrent_info());
|
||||||
|
// Expand first item if possible
|
||||||
|
filesList->expand(PropListModel->index(0, 0));
|
||||||
|
}
|
||||||
} catch(invalid_handle e) {
|
} catch(invalid_handle e) {
|
||||||
|
qDebug("Properties: INVALID HANDLE");
|
||||||
|
qDebug("what() == %s", e.what());
|
||||||
}
|
}
|
||||||
// Load dynamic data
|
// Load dynamic data
|
||||||
loadDynamicData();
|
loadDynamicData();
|
||||||
@@ -652,192 +656,192 @@ void PropertiesWidget::renameSelectedFile() {
|
|||||||
#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
|
#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
|
||||||
if(misc::toQStringU(h.get_torrent_info().file_at(i).path.string()).compare(new_name, Qt::CaseSensitive) == 0) {
|
if(misc::toQStringU(h.get_torrent_info().file_at(i).path.string()).compare(new_name, Qt::CaseSensitive) == 0) {
|
||||||
#else
|
#else
|
||||||
if(misc::toQStringU(h.get_torrent_info().file_at(i).path.string()).compare(new_name, Qt::CaseInsensitive) == 0) {
|
if(misc::toQStringU(h.get_torrent_info().file_at(i).path.string()).compare(new_name, Qt::CaseInsensitive) == 0) {
|
||||||
#endif
|
#endif
|
||||||
// Display error message
|
// Display error message
|
||||||
QMessageBox::warning(this, tr("The file could not be renamed"),
|
QMessageBox::warning(this, tr("The file could not be renamed"),
|
||||||
tr("This name is already in use in this folder. Please use a different name."),
|
tr("This name is already in use in this folder. Please use a different name."),
|
||||||
QMessageBox::Ok);
|
QMessageBox::Ok);
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
const bool force_recheck = QFile::exists(h.save_path()+QDir::separator()+new_name);
|
}
|
||||||
qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name));
|
const bool force_recheck = QFile::exists(h.save_path()+QDir::separator()+new_name);
|
||||||
h.rename_file(file_index, new_name);
|
qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name));
|
||||||
// Force recheck
|
h.rename_file(file_index, new_name);
|
||||||
if(force_recheck) h.force_recheck();
|
// Force recheck
|
||||||
// Rename if torrent files model too
|
if(force_recheck) h.force_recheck();
|
||||||
if(new_name_last.endsWith(".!qB"))
|
// Rename if torrent files model too
|
||||||
new_name_last.chop(4);
|
if(new_name_last.endsWith(".!qB"))
|
||||||
PropListModel->setData(index, new_name_last);
|
new_name_last.chop(4);
|
||||||
} else {
|
PropListModel->setData(index, new_name_last);
|
||||||
// Folder renaming
|
} else {
|
||||||
QStringList path_items;
|
// Folder renaming
|
||||||
path_items << index.data().toString();
|
QStringList path_items;
|
||||||
QModelIndex parent = PropListModel->parent(index);
|
path_items << index.data().toString();
|
||||||
while(parent.isValid()) {
|
QModelIndex parent = PropListModel->parent(index);
|
||||||
path_items.prepend(parent.data().toString());
|
while(parent.isValid()) {
|
||||||
parent = PropListModel->parent(parent);
|
path_items.prepend(parent.data().toString());
|
||||||
}
|
parent = PropListModel->parent(parent);
|
||||||
const QString old_path = path_items.join("/");
|
}
|
||||||
path_items.removeLast();
|
const QString old_path = path_items.join("/");
|
||||||
path_items << new_name_last;
|
path_items.removeLast();
|
||||||
QString new_path = path_items.join("/");
|
path_items << new_name_last;
|
||||||
if(!new_path.endsWith("/")) new_path += "/";
|
QString new_path = path_items.join("/");
|
||||||
// Check for overwriting
|
if(!new_path.endsWith("/")) new_path += "/";
|
||||||
const int num_files = h.num_files();
|
// Check for overwriting
|
||||||
for(int i=0; i<num_files; ++i) {
|
const int num_files = h.num_files();
|
||||||
const QString current_name = misc::toQStringU(h.get_torrent_info().file_at(i).path.string());
|
for(int i=0; i<num_files; ++i) {
|
||||||
|
const QString current_name = misc::toQStringU(h.get_torrent_info().file_at(i).path.string());
|
||||||
#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
|
#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
|
||||||
if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
|
if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
|
||||||
#else
|
#else
|
||||||
if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
|
if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
|
||||||
#endif
|
#endif
|
||||||
QMessageBox::warning(this, tr("The folder could not be renamed"),
|
QMessageBox::warning(this, tr("The folder could not be renamed"),
|
||||||
tr("This name is already in use in this folder. Please use a different name."),
|
tr("This name is already in use in this folder. Please use a different name."),
|
||||||
QMessageBox::Ok);
|
QMessageBox::Ok);
|
||||||
return;
|
return;
|
||||||
}
|
|
||||||
}
|
|
||||||
bool force_recheck = false;
|
|
||||||
// Replace path in all files
|
|
||||||
for(int i=0; i<num_files; ++i) {
|
|
||||||
const QString current_name = misc::toQStringU(h.get_torrent_info().file_at(i).path.string());
|
|
||||||
if(current_name.startsWith(old_path)) {
|
|
||||||
QString new_name = current_name;
|
|
||||||
new_name.replace(0, old_path.length(), new_path);
|
|
||||||
if(!force_recheck && QDir(h.save_path()).exists(new_name))
|
|
||||||
force_recheck = true;
|
|
||||||
new_name = QDir::cleanPath(new_name);
|
|
||||||
qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name));
|
|
||||||
h.rename_file(i, new_name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Force recheck
|
|
||||||
if(force_recheck) h.force_recheck();
|
|
||||||
// Rename folder in torrent files model too
|
|
||||||
PropListModel->setData(index, new_name_last);
|
|
||||||
// Remove old folder
|
|
||||||
const QDir old_folder(h.save_path()+"/"+old_path);
|
|
||||||
int timeout = 10;
|
|
||||||
while(!misc::removeEmptyTree(old_folder.absolutePath()) && timeout > 0) {
|
|
||||||
SleeperThread::msleep(100);
|
|
||||||
--timeout;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
bool force_recheck = false;
|
||||||
|
// Replace path in all files
|
||||||
void PropertiesWidget::askWebSeed(){
|
for(int i=0; i<num_files; ++i) {
|
||||||
bool ok;
|
const QString current_name = misc::toQStringU(h.get_torrent_info().file_at(i).path.string());
|
||||||
// Ask user for a new url seed
|
if(current_name.startsWith(old_path)) {
|
||||||
const QString url_seed = QInputDialog::getText(this, tr("New url seed", "New HTTP source"),
|
QString new_name = current_name;
|
||||||
tr("New url seed:"), QLineEdit::Normal,
|
new_name.replace(0, old_path.length(), new_path);
|
||||||
QString::fromUtf8("http://www."), &ok);
|
if(!force_recheck && QDir(h.save_path()).exists(new_name))
|
||||||
if(!ok) return;
|
force_recheck = true;
|
||||||
qDebug("Adding %s web seed", qPrintable(url_seed));
|
new_name = QDir::cleanPath(new_name);
|
||||||
if(!listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) {
|
qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name));
|
||||||
QMessageBox::warning(this, tr("qBittorrent"),
|
h.rename_file(i, new_name);
|
||||||
tr("This url seed is already in the list."),
|
|
||||||
QMessageBox::Ok);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
h.add_url_seed(url_seed);
|
|
||||||
// Refresh the seeds list
|
|
||||||
loadUrlSeeds();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PropertiesWidget::deleteSelectedUrlSeeds(){
|
|
||||||
const QList<QListWidgetItem *> selectedItems = listWebSeeds->selectedItems();
|
|
||||||
bool change = false;
|
|
||||||
foreach(const QListWidgetItem *item, selectedItems){
|
|
||||||
QString url_seed = item->text();
|
|
||||||
h.remove_url_seed(url_seed);
|
|
||||||
change = true;
|
|
||||||
}
|
|
||||||
if(change){
|
|
||||||
// Refresh list
|
|
||||||
loadUrlSeeds();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
bool PropertiesWidget::applyPriorities() {
|
|
||||||
qDebug("Saving pieces priorities");
|
|
||||||
const std::vector<int> priorities = PropListModel->getFilesPriorities(h.get_torrent_info().num_files());
|
|
||||||
bool first_last_piece_first = false;
|
|
||||||
// Save first/last piece first option state
|
|
||||||
if(h.first_last_piece_first())
|
|
||||||
first_last_piece_first = true;
|
|
||||||
// Prioritize the files
|
|
||||||
qDebug("prioritize files: %d", priorities[0]);
|
|
||||||
h.prioritize_files(priorities);
|
|
||||||
// Restore first/last piece first option if necessary
|
|
||||||
if(first_last_piece_first)
|
|
||||||
h.prioritize_first_last_piece(true);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void PropertiesWidget::on_changeSavePathButton_clicked() {
|
|
||||||
if(!h.is_valid()) return;
|
|
||||||
QString new_path;
|
|
||||||
if(h.has_metadata() && h.num_files() == 1) {
|
|
||||||
new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), h.firstFileSavePath());
|
|
||||||
} else {
|
|
||||||
const QDir saveDir(TorrentPersistentData::getSavePath(h.hash()));
|
|
||||||
QFileDialog dlg(this, tr("Choose save path"), saveDir.absolutePath());
|
|
||||||
dlg.setConfirmOverwrite(false);
|
|
||||||
dlg.setFileMode(QFileDialog::Directory);
|
|
||||||
dlg.setOption(QFileDialog::ShowDirsOnly, true);
|
|
||||||
dlg.setFilter(QDir::AllDirs);
|
|
||||||
dlg.setAcceptMode(QFileDialog::AcceptSave);
|
|
||||||
dlg.setNameFilterDetailsVisible(false);
|
|
||||||
if(dlg.exec())
|
|
||||||
new_path = dlg.selectedFiles().first();
|
|
||||||
}
|
|
||||||
if(!new_path.isEmpty()){
|
|
||||||
// Check if savePath exists
|
|
||||||
QString save_path_dir = new_path.replace("\\", "/");
|
|
||||||
QString new_file_name;
|
|
||||||
if(h.has_metadata() && h.num_files() == 1) {
|
|
||||||
QStringList parts = save_path_dir.split("/");
|
|
||||||
new_file_name = parts.takeLast(); // Skip file name
|
|
||||||
save_path_dir = parts.join("/");
|
|
||||||
}
|
}
|
||||||
QDir savePath(misc::expandPath(save_path_dir));
|
}
|
||||||
// Actually move storage
|
// Force recheck
|
||||||
if(!BTSession->useTemporaryFolder() || h.is_seed()) {
|
if(force_recheck) h.force_recheck();
|
||||||
if(!savePath.exists()) savePath.mkpath(savePath.absolutePath());
|
// Rename folder in torrent files model too
|
||||||
h.move_storage(savePath.absolutePath());
|
PropListModel->setData(index, new_name_last);
|
||||||
}
|
// Remove old folder
|
||||||
// Update save_path in dialog
|
const QDir old_folder(h.save_path()+"/"+old_path);
|
||||||
QString display_path;
|
int timeout = 10;
|
||||||
if(h.has_metadata() && h.num_files() == 1) {
|
while(!misc::removeEmptyTree(old_folder.absolutePath()) && timeout > 0) {
|
||||||
// Rename the file
|
SleeperThread::msleep(100);
|
||||||
Q_ASSERT(!new_file_name.isEmpty());
|
--timeout;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void PropertiesWidget::askWebSeed(){
|
||||||
|
bool ok;
|
||||||
|
// Ask user for a new url seed
|
||||||
|
const QString url_seed = QInputDialog::getText(this, tr("New url seed", "New HTTP source"),
|
||||||
|
tr("New url seed:"), QLineEdit::Normal,
|
||||||
|
QString::fromUtf8("http://www."), &ok);
|
||||||
|
if(!ok) return;
|
||||||
|
qDebug("Adding %s web seed", qPrintable(url_seed));
|
||||||
|
if(!listWebSeeds->findItems(url_seed, Qt::MatchFixedString).empty()) {
|
||||||
|
QMessageBox::warning(this, tr("qBittorrent"),
|
||||||
|
tr("This url seed is already in the list."),
|
||||||
|
QMessageBox::Ok);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
h.add_url_seed(url_seed);
|
||||||
|
// Refresh the seeds list
|
||||||
|
loadUrlSeeds();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PropertiesWidget::deleteSelectedUrlSeeds(){
|
||||||
|
const QList<QListWidgetItem *> selectedItems = listWebSeeds->selectedItems();
|
||||||
|
bool change = false;
|
||||||
|
foreach(const QListWidgetItem *item, selectedItems){
|
||||||
|
QString url_seed = item->text();
|
||||||
|
h.remove_url_seed(url_seed);
|
||||||
|
change = true;
|
||||||
|
}
|
||||||
|
if(change){
|
||||||
|
// Refresh list
|
||||||
|
loadUrlSeeds();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PropertiesWidget::applyPriorities() {
|
||||||
|
qDebug("Saving pieces priorities");
|
||||||
|
const std::vector<int> priorities = PropListModel->getFilesPriorities(h.get_torrent_info().num_files());
|
||||||
|
bool first_last_piece_first = false;
|
||||||
|
// Save first/last piece first option state
|
||||||
|
if(h.first_last_piece_first())
|
||||||
|
first_last_piece_first = true;
|
||||||
|
// Prioritize the files
|
||||||
|
qDebug("prioritize files: %d", priorities[0]);
|
||||||
|
h.prioritize_files(priorities);
|
||||||
|
// Restore first/last piece first option if necessary
|
||||||
|
if(first_last_piece_first)
|
||||||
|
h.prioritize_first_last_piece(true);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PropertiesWidget::on_changeSavePathButton_clicked() {
|
||||||
|
if(!h.is_valid()) return;
|
||||||
|
QString new_path;
|
||||||
|
if(h.has_metadata() && h.num_files() == 1) {
|
||||||
|
new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), h.firstFileSavePath());
|
||||||
|
} else {
|
||||||
|
const QDir saveDir(TorrentPersistentData::getSavePath(h.hash()));
|
||||||
|
QFileDialog dlg(this, tr("Choose save path"), saveDir.absolutePath());
|
||||||
|
dlg.setConfirmOverwrite(false);
|
||||||
|
dlg.setFileMode(QFileDialog::Directory);
|
||||||
|
dlg.setOption(QFileDialog::ShowDirsOnly, true);
|
||||||
|
dlg.setFilter(QDir::AllDirs);
|
||||||
|
dlg.setAcceptMode(QFileDialog::AcceptSave);
|
||||||
|
dlg.setNameFilterDetailsVisible(false);
|
||||||
|
if(dlg.exec())
|
||||||
|
new_path = dlg.selectedFiles().first();
|
||||||
|
}
|
||||||
|
if(!new_path.isEmpty()){
|
||||||
|
// Check if savePath exists
|
||||||
|
QString save_path_dir = new_path.replace("\\", "/");
|
||||||
|
QString new_file_name;
|
||||||
|
if(h.has_metadata() && h.num_files() == 1) {
|
||||||
|
QStringList parts = save_path_dir.split("/");
|
||||||
|
new_file_name = parts.takeLast(); // Skip file name
|
||||||
|
save_path_dir = parts.join("/");
|
||||||
|
}
|
||||||
|
QDir savePath(misc::expandPath(save_path_dir));
|
||||||
|
// Actually move storage
|
||||||
|
if(!BTSession->useTemporaryFolder() || h.is_seed()) {
|
||||||
|
if(!savePath.exists()) savePath.mkpath(savePath.absolutePath());
|
||||||
|
h.move_storage(savePath.absolutePath());
|
||||||
|
}
|
||||||
|
// Update save_path in dialog
|
||||||
|
QString display_path;
|
||||||
|
if(h.has_metadata() && h.num_files() == 1) {
|
||||||
|
// Rename the file
|
||||||
|
Q_ASSERT(!new_file_name.isEmpty());
|
||||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||||
if(h.file_at(0).compare(new_file_name, Qt::CaseInsensitive) != 0) {
|
if(h.file_at(0).compare(new_file_name, Qt::CaseInsensitive) != 0) {
|
||||||
#else
|
#else
|
||||||
if(h.file_at(0).compare(new_file_name, Qt::CaseSensitive) != 0) {
|
if(h.file_at(0).compare(new_file_name, Qt::CaseSensitive) != 0) {
|
||||||
#endif
|
#endif
|
||||||
qDebug("Renaming single file to %s", qPrintable(new_file_name));
|
qDebug("Renaming single file to %s", qPrintable(new_file_name));
|
||||||
h.rename_file(0, new_file_name);
|
h.rename_file(0, new_file_name);
|
||||||
// Also rename it in the files list model
|
// Also rename it in the files list model
|
||||||
PropListModel->setData(PropListModel->index(0, 0), new_file_name);
|
PropListModel->setData(PropListModel->index(0, 0), new_file_name);
|
||||||
}
|
}
|
||||||
display_path = h.firstFileSavePath();
|
display_path = h.firstFileSavePath();
|
||||||
} else {
|
} else {
|
||||||
display_path = savePath.absolutePath();
|
display_path = savePath.absolutePath();
|
||||||
}
|
}
|
||||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||||
display_path = display_path.replace("/", "\\");
|
display_path = display_path.replace("/", "\\");
|
||||||
#endif
|
#endif
|
||||||
save_path->setText(display_path);
|
save_path->setText(display_path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PropertiesWidget::filteredFilesChanged() {
|
void PropertiesWidget::filteredFilesChanged() {
|
||||||
if(h.is_valid()) {
|
if(h.is_valid()) {
|
||||||
applyPriorities();
|
applyPriorities();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user