d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6330 from Chocobo1/rename 

Fix renaming files is not case sensitive on Windows platform
adaptive-webui-19844
Mike Tzou 8 years ago committed by GitHub
parent
ced52e3269 08a6c75227
commit
92decf83b8
7 changed files with 211 additions and 212 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/base/utils/fs.cpp
  2. 116
      src/gui/addnewtorrentdialog.cpp
  3. 4
      src/gui/addnewtorrentdialog.h
  4. 2
      src/gui/previewselect.cpp
  5. 144
      src/gui/properties/propertieswidget.cpp
  6. 4
      src/gui/torrentcontentmodelfile.cpp
  7. 5
      src/gui/torrentcontentmodelfolder.cpp

12
src/base/utils/fs.cpp
Unescape View File

@ -38,8 +38,9 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QStorageInfo> #include <QStorageInfo>
#ifndef Q_OS_WIN #if defined(Q_OS_WIN)
#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) #include <Windows.h>
#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD)
#include <sys/param.h> #include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#elif defined(Q_OS_HAIKU) #elif defined(Q_OS_HAIKU)
@ -47,9 +48,8 @@
#else #else
#include <sys/vfs.h> #include <sys/vfs.h>
#endif #endif
#else
#include <Windows.h> #include "base/bittorrent/torrenthandle.h"
#endif
/** /**
* Converts a path to a string suitable for display. * Converts a path to a string suitable for display.
@ -71,7 +71,7 @@ QString Utils::Fs::fromNativePath(const QString &path)
*/ */
QString Utils::Fs::fileExtension(const QString &filename) QString Utils::Fs::fileExtension(const QString &filename)
{ {
QString ext = QString(filename).remove(".!qB"); QString ext = QString(filename).remove(QB_EXT);
const int point_index = ext.lastIndexOf("."); const int point_index = ext.lastIndexOf(".");
return (point_index >= 0) ? ext.mid(point_index + 1) : QString(); return (point_index >= 0) ? ext.mid(point_index + 1) : QString();
} }

116
src/gui/addnewtorrentdialog.cpp
Unescape View File

@ -443,79 +443,80 @@ void AddNewTorrentDialog::setSavePath(const QString &newPath)
void AddNewTorrentDialog::renameSelectedFile() void AddNewTorrentDialog::renameSelectedFile()
{ {
const QModelIndexList selectedIndexes = ui->contentTreeView->selectionModel()->selectedRows(0); const QModelIndexList selectedIndexes = ui->contentTreeView->selectionModel()->selectedRows(0);
if (selectedIndexes.size() != 1) if (selectedIndexes.size() != 1) return;
return;
const QModelIndex &index = selectedIndexes.first(); const QModelIndex modelIndex = selectedIndexes.first();
if (!index.isValid()) if (!modelIndex.isValid()) return;
return;
// Ask for new name // Ask for new name
bool ok; bool ok = false;
const QString new_name_last = AutoExpandableDialog::getText(this, tr("Rename the file"), QString newName = AutoExpandableDialog::getText(this, tr("Renaming"), tr("New name:"), QLineEdit::Normal, modelIndex.data().toString(), &ok)
tr("New name:"), QLineEdit::Normal, .trimmed();
index.data().toString(), &ok).trimmed(); if (!ok) return;
if (ok && !new_name_last.isEmpty()) {
if (!Utils::Fs::isValidFileSystemName(new_name_last)) { if (newName.isEmpty() || !Utils::Fs::isValidFileSystemName(newName)) {
MessageBoxRaised::warning(this, tr("The file could not be renamed"), MessageBoxRaised::warning(this, tr("Rename error"),
tr("This file name contains forbidden characters, please choose a different one."), tr("The name is empty or contains forbidden characters, please choose a different one."),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
if (m_contentModel->itemType(index) == TorrentContentModelItem::FileType) {
// File renaming if (m_contentModel->itemType(modelIndex) == TorrentContentModelItem::FileType) {
const int file_index = m_contentModel->getFileIndex(index); // renaming a file
QString old_name = Utils::Fs::fromNativePath(m_torrentInfo.filePath(file_index)); const int fileIndex = m_contentModel->getFileIndex(modelIndex);
qDebug("Old name: %s", qPrintable(old_name));
QStringList path_items = old_name.split("/"); if (newName.endsWith(QB_EXT))
path_items.removeLast(); newName.chop(QB_EXT.size());
path_items << new_name_last; const QString oldFileName = m_torrentInfo.fileName(fileIndex);
QString new_name = path_items.join("/"); const QString oldFilePath = m_torrentInfo.filePath(fileIndex);
if (Utils::Fs::sameFileNames(old_name, new_name)) { const QString newFilePath = oldFilePath.leftRef(oldFilePath.size() - oldFileName.size()) + newName;
qDebug("Name did not change");
if (oldFileName == newName) {
qDebug("Name did not change: %s", qPrintable(oldFileName));
return; return;
} }
new_name = Utils::Fs::expandPath(new_name);
qDebug("New name: %s", qPrintable(new_name)); // check if that name is already used
// Check if that name is already used
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) { for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
if (i == file_index) continue; if (i == fileIndex) continue;
if (Utils::Fs::sameFileNames(m_torrentInfo.filePath(i), new_name)) { if (Utils::Fs::sameFileNames(m_torrentInfo.filePath(i), newFilePath)) {
// Display error message MessageBoxRaised::warning(this, tr("Rename error"),
MessageBoxRaised::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;
} }
} }
qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name));
m_torrentInfo.renameFile(file_index, new_name); qDebug("Renaming %s to %s", qPrintable(oldFilePath), qPrintable(newFilePath));
// Rename in torrent files model too m_torrentInfo.renameFile(fileIndex, newFilePath);
m_contentModel->setData(index, new_name_last);
m_contentModel->setData(modelIndex, newName);
} }
else { else {
// Folder renaming // renaming a folder
QStringList path_items; QStringList pathItems;
path_items << index.data().toString(); pathItems << modelIndex.data().toString();
QModelIndex parent = m_contentModel->parent(index); QModelIndex parent = m_contentModel->parent(modelIndex);
while (parent.isValid()) { while (parent.isValid()) {
path_items.prepend(parent.data().toString()); pathItems.prepend(parent.data().toString());
parent = m_contentModel->parent(parent); parent = m_contentModel->parent(parent);
} }
const QString old_path = path_items.join("/"); const QString oldPath = pathItems.join("/");
path_items.removeLast(); pathItems.removeLast();
path_items << new_name_last; pathItems << newName;
QString new_path = path_items.join("/"); QString newPath = pathItems.join("/");
if (Utils::Fs::sameFileNames(old_path, new_path)) { if (Utils::Fs::sameFileNames(oldPath, newPath)) {
qDebug("Name did not change"); qDebug("Name did not change");
return; return;
} }
if (!new_path.endsWith("/")) new_path += "/"; if (!newPath.endsWith("/")) newPath += "/";
// Check for overwriting // Check for overwriting
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) { for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
const QString &current_name = m_torrentInfo.filePath(i); const QString &currentName = m_torrentInfo.filePath(i);
#if defined(Q_OS_UNIX) || defined(Q_WS_QWS) #if defined(Q_OS_UNIX) || defined(Q_WS_QWS)
if (current_name.startsWith(new_path, Qt::CaseSensitive)) { if (currentName.startsWith(newPath, Qt::CaseSensitive)) {
#else #else
if (current_name.startsWith(new_path, Qt::CaseInsensitive)) { if (currentName.startsWith(newPath, Qt::CaseInsensitive)) {
#endif #endif
MessageBoxRaised::warning(this, tr("The folder could not be renamed"), MessageBoxRaised::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."),
@ -525,19 +526,18 @@ void AddNewTorrentDialog::renameSelectedFile()
} }
// Replace path in all files // Replace path in all files
for (int i = 0; i < m_torrentInfo.filesCount(); ++i) { for (int i = 0; i < m_torrentInfo.filesCount(); ++i) {
const QString &current_name = m_torrentInfo.filePath(i); const QString &currentName = m_torrentInfo.filePath(i);
if (current_name.startsWith(old_path)) { if (currentName.startsWith(oldPath)) {
QString new_name = current_name; QString newName = currentName;
new_name.replace(0, old_path.length(), new_path); newName.replace(0, oldPath.length(), newPath);
new_name = Utils::Fs::expandPath(new_name); newName = Utils::Fs::expandPath(newName);
qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name)); qDebug("Rename %s to %s", qPrintable(currentName), qPrintable(newName));
m_torrentInfo.renameFile(i, new_name); m_torrentInfo.renameFile(i, newName);
} }
} }
// Rename folder in torrent files model too // Rename folder in torrent files model too
m_contentModel->setData(index, new_name_last); m_contentModel->setData(modelIndex, newName);
}
} }
} }

4
src/gui/addnewtorrentdialog.h
Unescape View File

@ -71,7 +71,7 @@ public:
private slots: private slots:
void showAdvancedSettings(bool show); void showAdvancedSettings(bool show);
void displayContentTreeMenu(const QPoint&); void displayContentTreeMenu(const QPoint &);
void updateDiskSpaceLabel(); void updateDiskSpaceLabel();
void onSavePathChanged(const QString &newPath); void onSavePathChanged(const QString &newPath);
void renameSelectedFile(); void renameSelectedFile();
@ -92,7 +92,7 @@ private:
bool loadMagnet(const BitTorrent::MagnetUri &magnetUri); bool loadMagnet(const BitTorrent::MagnetUri &magnetUri);
void populateSavePathComboBox(); void populateSavePathComboBox();
void saveSavePathHistory() const; void saveSavePathHistory() const;
int indexOfSavePath(const QString& save_path); int indexOfSavePath(const QString &save_path);
void loadState(); void loadState();
void saveState(); void saveState();
void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString()); void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString());

2
src/gui/previewselect.cpp
Unescape View File

@ -69,7 +69,7 @@ PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const t
int nbFiles = torrent->filesCount(); int nbFiles = torrent->filesCount();
for (int i = 0; i < nbFiles; ++i) { for (int i = 0; i < nbFiles; ++i) {
QString fileName = torrent->fileName(i); QString fileName = torrent->fileName(i);
if (fileName.endsWith(".!qB")) if (fileName.endsWith(QB_EXT))
fileName.chop(4); fileName.chop(4);
QString extension = Utils::Fs::fileExtension(fileName).toUpper(); QString extension = Utils::Fs::fileExtension(fileName).toUpper();
if (Utils::Misc::isPreviewable(extension)) { if (Utils::Misc::isPreviewable(extension)) {

144
src/gui/properties/propertieswidget.cpp
Unescape View File

@ -210,7 +210,7 @@ void PropertiesWidget::showPiecesDownloaded(bool show)
void PropertiesWidget::setVisibility(bool visible) void PropertiesWidget::setVisibility(bool visible)
{ {
if (!visible && ( state == VISIBLE) ) { if (!visible && (state == VISIBLE)) {
QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget()); QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget());
m_ui->stackedProperties->setVisible(false); m_ui->stackedProperties->setVisible(false);
slideSizes = hSplitter->sizes(); slideSizes = hSplitter->sizes();
@ -222,7 +222,7 @@ void PropertiesWidget::setVisibility(bool visible)
return; return;
} }
if (visible && ( state == REDUCED) ) { if (visible && (state == REDUCED)) {
m_ui->stackedProperties->setVisible(true); m_ui->stackedProperties->setVisible(true);
QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget()); QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget());
hSplitter->handle(1)->setDisabled(false); hSplitter->handle(1)->setDisabled(false);
@ -363,7 +363,7 @@ void PropertiesWidget::readSettings()
void PropertiesWidget::saveSettings() void PropertiesWidget::saveSettings()
{ {
Preferences *const pref = Preferences::instance(); Preferences *const pref = Preferences::instance();
pref->setPropVisible(state==VISIBLE); pref->setPropVisible(state == VISIBLE);
// Splitter sizes // Splitter sizes
QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget()); QSplitter *hSplitter = static_cast<QSplitter *>(parentWidget());
QList<int> sizes; QList<int> sizes;
@ -671,87 +671,84 @@ void PropertiesWidget::displayWebSeedListMenu(const QPoint &)
void PropertiesWidget::renameSelectedFile() void PropertiesWidget::renameSelectedFile()
{ {
if (!m_torrent) return;
const QModelIndexList selectedIndexes = m_ui->filesList->selectionModel()->selectedRows(0); const QModelIndexList selectedIndexes = m_ui->filesList->selectionModel()->selectedRows(0);
if (selectedIndexes.size() != 1) if (selectedIndexes.size() != 1) return;
return;
const QModelIndex index = selectedIndexes.first(); const QModelIndex modelIndex = selectedIndexes.first();
if (!index.isValid()) if (!modelIndex.isValid()) return;
return;
// Ask for new name // Ask for new name
bool ok; bool ok = false;
QString new_name_last = AutoExpandableDialog::getText(this, tr("Rename the file"), QString newName = AutoExpandableDialog::getText(this, tr("Renaming"), tr("New name:"), QLineEdit::Normal, modelIndex.data().toString(), &ok)
tr("New name:"), QLineEdit::Normal, .trimmed();
index.data().toString(), &ok).trimmed(); if (!ok) return;
if (ok && !new_name_last.isEmpty()) {
if (!Utils::Fs::isValidFileSystemName(new_name_last)) { if (newName.isEmpty() || !Utils::Fs::isValidFileSystemName(newName)) {
MessageBoxRaised::warning(this, tr("The file could not be renamed"), MessageBoxRaised::warning(this, tr("Rename error"),
tr("This file name contains forbidden characters, please choose a different one."), tr("The name is empty or contains forbidden characters, please choose a different one."),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
if (PropListModel->itemType(index) == TorrentContentModelItem::FileType) {
// File renaming if (PropListModel->itemType(modelIndex) == TorrentContentModelItem::FileType) {
const int file_index = PropListModel->getFileIndex(index); // renaming a file
if (!m_torrent || !m_torrent->hasMetadata()) return; const int fileIndex = PropListModel->getFileIndex(modelIndex);
QString old_name = m_torrent->filePath(file_index);
if (old_name.endsWith(".!qB") && !new_name_last.endsWith(".!qB")) if (newName.endsWith(QB_EXT))
new_name_last += ".!qB"; newName.chop(QB_EXT.size());
QStringList path_items = old_name.split("/"); const QString oldFileName = m_torrent->fileName(fileIndex);
path_items.removeLast(); const QString oldFilePath = m_torrent->filePath(fileIndex);
path_items << new_name_last; const QString newFileName = newName + (BitTorrent::Session::instance()->isAppendExtensionEnabled() ? QB_EXT : QString());
QString new_name = path_items.join("/"); const QString newFilePath = oldFilePath.leftRef(oldFilePath.size() - oldFileName.size()) + newFileName;
if (Utils::Fs::sameFileNames(old_name, new_name)) {
qDebug("Name did not change"); if (oldFileName == newFileName) {
qDebug("Name did not change: %s", qPrintable(oldFileName));
return; return;
} }
new_name = Utils::Fs::expandPath(new_name);
qDebug("New name: %s", qPrintable(new_name)); // check if that name is already used
// Check if that name is already used
for (int i = 0; i < m_torrent->filesCount(); ++i) { for (int i = 0; i < m_torrent->filesCount(); ++i) {
if (i == file_index) continue; if (i == fileIndex) continue;
if (Utils::Fs::sameFileNames(m_torrent->filePath(i), new_name)) { if (Utils::Fs::sameFileNames(m_torrent->filePath(i), newFilePath)) {
// Display error message MessageBoxRaised::warning(this, tr("Rename error"),
MessageBoxRaised::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(m_torrent->savePath(true) + "/" + new_name);
qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name)); qDebug("Renaming %s to %s", qPrintable(oldFilePath), qPrintable(newFilePath));
m_torrent->renameFile(file_index, new_name); m_torrent->renameFile(fileIndex, newFilePath);
// Force recheck
if (force_recheck) m_torrent->forceRecheck(); PropListModel->setData(modelIndex, newName);
// Rename if torrent files model too
if (new_name_last.endsWith(".!qB"))
new_name_last.chop(4);
PropListModel->setData(index, new_name_last);
} }
else { else {
// Folder renaming // renaming a folder
QStringList path_items; QStringList pathItems;
path_items << index.data().toString(); pathItems << modelIndex.data().toString();
QModelIndex parent = PropListModel->parent(index); QModelIndex parent = PropListModel->parent(modelIndex);
while (parent.isValid()) { while (parent.isValid()) {
path_items.prepend(parent.data().toString()); pathItems.prepend(parent.data().toString());
parent = PropListModel->parent(parent); parent = PropListModel->parent(parent);
} }
const QString old_path = path_items.join("/"); const QString oldPath = pathItems.join("/");
path_items.removeLast(); pathItems.removeLast();
path_items << new_name_last; pathItems << newName;
QString new_path = path_items.join("/"); QString newPath = pathItems.join("/");
if (Utils::Fs::sameFileNames(old_path, new_path)) { if (Utils::Fs::sameFileNames(oldPath, newPath)) {
qDebug("Name did not change"); qDebug("Name did not change");
return; return;
} }
if (!new_path.endsWith("/")) new_path += "/"; if (!newPath.endsWith("/")) newPath += "/";
// Check for overwriting // Check for overwriting
for (int i = 0; i < m_torrent->filesCount(); ++i) { for (int i = 0; i < m_torrent->filesCount(); ++i) {
const QString &current_name = m_torrent->filePath(i); const QString &currentName = m_torrent->filePath(i);
#if defined(Q_OS_UNIX) || defined(Q_WS_QWS) #if defined(Q_OS_UNIX) || defined(Q_WS_QWS)
if (current_name.startsWith(new_path, Qt::CaseSensitive)) { if (currentName.startsWith(newPath, Qt::CaseSensitive)) {
#else #else
if (current_name.startsWith(new_path, Qt::CaseInsensitive)) { if (currentName.startsWith(newPath, 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."),
@ -759,34 +756,33 @@ void PropertiesWidget::renameSelectedFile()
return; return;
} }
} }
bool force_recheck = false; bool forceRecheck = false;
// Replace path in all files // Replace path in all files
for (int i = 0; i < m_torrent->filesCount(); ++i) { for (int i = 0; i < m_torrent->filesCount(); ++i) {
const QString current_name = m_torrent->filePath(i); const QString currentName = m_torrent->filePath(i);
if (current_name.startsWith(old_path)) { if (currentName.startsWith(oldPath)) {
QString new_name = current_name; QString newName = currentName;
new_name.replace(0, old_path.length(), new_path); newName.replace(0, oldPath.length(), newPath);
if (!force_recheck && QDir(m_torrent->savePath(true)).exists(new_name)) if (!forceRecheck && QDir(m_torrent->savePath(true)).exists(newName))
force_recheck = true; forceRecheck = true;
new_name = Utils::Fs::expandPath(new_name); newName = Utils::Fs::expandPath(newName);
qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name)); qDebug("Rename %s to %s", qPrintable(currentName), qPrintable(newName));
m_torrent->renameFile(i, new_name); m_torrent->renameFile(i, newName);
} }
} }
// Force recheck // Force recheck
if (force_recheck) m_torrent->forceRecheck(); if (forceRecheck) m_torrent->forceRecheck();
// Rename folder in torrent files model too // Rename folder in torrent files model too
PropListModel->setData(index, new_name_last); PropListModel->setData(modelIndex, newName);
// Remove old folder // Remove old folder
const QDir old_folder(m_torrent->savePath(true) + "/" + old_path); const QDir oldFolder(m_torrent->savePath(true) + "/" + oldPath);
int timeout = 10; int timeout = 10;
while (!QDir().rmpath(old_folder.absolutePath()) && timeout > 0) { while (!QDir().rmpath(oldFolder.absolutePath()) && timeout > 0) {
// FIXME: We should not sleep here (freezes the UI for 1 second) // FIXME: We should not sleep here (freezes the UI for 1 second)
QThread::msleep(100); QThread::msleep(100);
--timeout; --timeout;
} }
} }
}
} }
void PropertiesWidget::openSelectedFile() void PropertiesWidget::openSelectedFile()

4
src/gui/torrentcontentmodelfile.cpp
Unescape View File

@ -29,6 +29,8 @@
*/ */
#include "torrentcontentmodelfile.h" #include "torrentcontentmodelfile.h"
#include "base/bittorrent/torrenthandle.h"
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize, TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulonglong fileSize,
@ -41,7 +43,7 @@ TorrentContentModelFile::TorrentContentModelFile(const QString &fileName, qulong
m_name = fileName; m_name = fileName;
// Do not display incomplete extensions // Do not display incomplete extensions
if (m_name.endsWith(".!qB")) if (m_name.endsWith(QB_EXT))
m_name.chop(4); m_name.chop(4);
m_size = fileSize; m_size = fileSize;

5
src/gui/torrentcontentmodelfolder.cpp
Unescape View File

@ -28,16 +28,17 @@
* Contact : chris@qbittorrent.org * Contact : chris@qbittorrent.org
*/ */
#include <QDebug>
#include "torrentcontentmodelfolder.h" #include "torrentcontentmodelfolder.h"
#include "base/bittorrent/torrenthandle.h"
TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent) TorrentContentModelFolder::TorrentContentModelFolder(const QString &name, TorrentContentModelFolder *parent)
: TorrentContentModelItem(parent) : TorrentContentModelItem(parent)
{ {
Q_ASSERT(parent); Q_ASSERT(parent);
m_name = name; m_name = name;
// Do not display incomplete extensions // Do not display incomplete extensions
if (m_name.endsWith(".!qB")) if (m_name.endsWith(QB_EXT))
m_name.chop(4); m_name.chop(4);
} }

Write Preview
Loading…
Cancel
Save