github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-07-13 08:43:08 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Update WebUI classes

Browse source 
Guaranteed to show paths with native separators to user
This commit is contained in:
Nick Tiskov 2013-11-10 18:29:17 +04:00
parent 237420546b
commit cb7f35d994
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/webui/btjson.cpp
View file

@ -32,6 +32,7 @@
#include "jsondict.h" #include "jsondict.h"
#include "jsonlist.h" #include "jsonlist.h"
#include "misc.h" #include "misc.h"
#include "fs_utils.h"
#include "qbtsession.h" #include "qbtsession.h"
#include "torrentpersistentdata.h" #include "torrentpersistentdata.h"
@ -287,9 +288,9 @@ QString btjson::getPropertiesForTorrent(const QString& hash)
return QString(); return QString();
// Save path // Save path
QString save_path = TorrentPersistentData::getSavePath(hash); QString save_path = fsutils::toNativePath(TorrentPersistentData::getSavePath(hash));
if (save_path.isEmpty()) if (save_path.isEmpty())
save_path = h.save_path(); save_path = fsutils::toNativePath(h.save_path());
data.add(KEY_PROP_SAVE_PATH, save_path); data.add(KEY_PROP_SAVE_PATH, save_path);
data.add(KEY_PROP_CREATION_DATE, h.creation_date()); data.add(KEY_PROP_CREATION_DATE, h.creation_date());
data.add(KEY_PROP_PIECE_SIZE, misc::friendlyUnit(h.piece_length())); data.add(KEY_PROP_PIECE_SIZE, misc::friendlyUnit(h.piece_length()));
@ -341,7 +342,7 @@ QString btjson::getFilesForTorrent(const QString& hash)
QString fileName = h.filename_at(i); QString fileName = h.filename_at(i);
if (fileName.endsWith(".!qB", Qt::CaseInsensitive)) if (fileName.endsWith(".!qB", Qt::CaseInsensitive))
fileName.chop(4); fileName.chop(4);
file_dict.add(KEY_FILE_NAME, fileName); file_dict.add(KEY_FILE_NAME, fsutils::toNativePath(fileName));
const size_type size = h.filesize_at(i); const size_type size = h.filesize_at(i);
file_dict.add(KEY_FILE_SIZE, misc::friendlyUnit(size)); file_dict.add(KEY_FILE_SIZE, misc::friendlyUnit(size));
file_dict.add(KEY_FILE_PROGRESS, (size > 0) ? (fp[i] / (double) size) : 1.); file_dict.add(KEY_FILE_PROGRESS, (size > 0) ? (fp[i] / (double) size) : 1.);

18
src/webui/prefjson.cpp
View file

@ -53,17 +53,21 @@ QString prefjson::getPreferences()
// UI // UI
data.add("locale", pref.getLocale()); data.add("locale", pref.getLocale());
// Downloads // Downloads
data.add("save_path", pref.getSavePath()); data.add("save_path", fsutils::toNativePath(pref.getSavePath()));
data.add("temp_path_enabled", pref.isTempPathEnabled()); data.add("temp_path_enabled", pref.isTempPathEnabled());
data.add("temp_path", pref.getTempPath()); data.add("temp_path", fsutils::toNativePath(pref.getTempPath()));
data.add("scan_dirs", pref.getScanDirs()); QStringList l;
foreach (const QString& s, pref.getScanDirs()) {
l << fsutils::toNativePath(s);
}
data.add("scan_dirs", l);
QVariantList var_list; QVariantList var_list;
foreach (bool b, pref.getDownloadInScanDirs()) { foreach (bool b, pref.getDownloadInScanDirs()) {
var_list << b; var_list << b;
} }
data.add("download_in_scan_dirs", var_list); data.add("download_in_scan_dirs", var_list);
data.add("export_dir_enabled", pref.isTorrentExportEnabled()); data.add("export_dir_enabled", pref.isTorrentExportEnabled());
data.add("export_dir", pref.getTorrentExportDir()); data.add("export_dir", fsutils::toNativePath(pref.getTorrentExportDir()));
data.add("mail_notification_enabled", pref.isMailNotificationEnabled()); data.add("mail_notification_enabled", pref.isMailNotificationEnabled());
data.add("mail_notification_email", pref.getMailNotificationEmail()); data.add("mail_notification_email", pref.getMailNotificationEmail());
data.add("mail_notification_smtp", pref.getMailNotificationSMTP()); data.add("mail_notification_smtp", pref.getMailNotificationSMTP());
@ -72,7 +76,7 @@ QString prefjson::getPreferences()
data.add("mail_notification_username", pref.getMailNotificationSMTPUsername()); data.add("mail_notification_username", pref.getMailNotificationSMTPUsername());
data.add("mail_notification_password", pref.getMailNotificationSMTPPassword()); data.add("mail_notification_password", pref.getMailNotificationSMTPPassword());
data.add("autorun_enabled", pref.isAutoRunEnabled()); data.add("autorun_enabled", pref.isAutoRunEnabled());
data.add("autorun_program", pref.getAutoRunProgram()); data.add("autorun_program", fsutils::toNativePath(pref.getAutoRunProgram()));
data.add("preallocate_all", pref.preAllocateAllFiles()); data.add("preallocate_all", pref.preAllocateAllFiles());
data.add("queueing_enabled", pref.isQueueingSystemEnabled()); data.add("queueing_enabled", pref.isQueueingSystemEnabled());
data.add("max_active_downloads", pref.getMaxActiveDownloads()); data.add("max_active_downloads", pref.getMaxActiveDownloads());
@ -119,7 +123,7 @@ QString prefjson::getPreferences()
data.add("proxy_password", pref.getProxyPassword()); data.add("proxy_password", pref.getProxyPassword());
// IP Filter // IP Filter
data.add("ip_filter_enabled", pref.isFilteringEnabled()); data.add("ip_filter_enabled", pref.isFilteringEnabled());
data.add("ip_filter_path", pref.getFilter()); data.add("ip_filter_path", fsutils::toNativePath(pref.getFilter()));
// Web UI // Web UI
data.add("web_ui_port", pref.getWebUiPort()); data.add("web_ui_port", pref.getWebUiPort());
data.add("web_ui_username", pref.getWebUiUsername()); data.add("web_ui_username", pref.getWebUiUsername());
@ -186,7 +190,7 @@ void prefjson::setPreferences(const QString& json)
foreach (const QString &new_folder, new_folders) { foreach (const QString &new_folder, new_folders) {
qDebug("New watched folder: %s", qPrintable(new_folder)); qDebug("New watched folder: %s", qPrintable(new_folder));
// Update new folders // Update new folders
if (!old_folders.contains(new_folder)) { if (!old_folders.contains(fsutils::fromNativePath(new_folder))) {
QBtSession::instance()->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i)); QBtSession::instance()->getScanFoldersModel()->addPath(new_folder, download_at_path.at(i));
} }
++i; ++i;