mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-10-22 10:46:04 +03:00
Code Issues Projects Releases Packages Wiki Activity

Reverting fs_utils.cpp and fixing callers instead

Browse source
This commit is contained in:
Andrea Villa 2013-02-09 18:55:10 +01:00
parent ccd50262c6
commit b6f156b7dd
3 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/fs_utils.cpp
View file

@ -81,18 +81,8 @@ QString fsutils::toDisplayPath(const QString& path)
*/
QString fsutils::fileExtension(const QString &filename)
{
QString holder;
int point_index = filename.lastIndexOf(".");
if (point_index >= 0) {
holder = filename.mid(point_index + 1);
if (holder == "!qB") {
holder = filename.mid(0, point_index);
point_index = holder.lastIndexOf(".");
holder = (point_index >= 0) ? holder.mid(point_index + 1) : QString();
}
return holder;
}
return QString();
const int point_index = filename.lastIndexOf(".");
return (point_index >= 0) ? filename.mid(point_index + 1) : QString();
}
QString fsutils::fileName(const QString& file_path)

2
src/previewselect.cpp
View file

@ -59,6 +59,8 @@ PreviewSelect::PreviewSelect(QWidget* parent, QTorrentHandle h): QDialog(parent)
unsigned int nbFiles = h.num_files();
for (unsigned int i=0; i<nbFiles; ++i) {
QString fileName = h.filename_at(i);
if (fileName.endsWith(".!qB"))
fileName.chop(4);
QString extension = fsutils::fileExtension(fileName).toUpper();
if (misc::isPreviewable(extension)) {
int row = previewListModel->rowCount();

5
src/qtlibtorrent/qbtsession.cpp
View file

@ -1731,7 +1731,10 @@ bool QBtSession::isFilePreviewPossible(const QString &hash) const {
}
const unsigned int nbFiles = h.num_files();
for (unsigned int i=0; i<nbFiles; ++i) {
const QString extension = fsutils::fileExtension(h.filename_at(i));
QString filename = h.filename_at(i);
if (filename.endsWith(".!qB"))
filename.chop(4);
const QString extension = fsutils::fileExtension(filename);
if (misc::isPreviewable(extension))
return true;
}