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

WebUI: Add filelog settings 

PR #18506.
Closes #17421.
adaptive-webui-19844
brvphoenix 2 years ago committed by GitHub
parent
d06f78dbbd
commit
e37661d53a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 162 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/webui/api/appcontroller.cpp
  2. 2
      src/webui/webapplication.h
  3. 117
      src/webui/www/private/views/preferences.html
  4. 7
      src/webui/www/private/views/preferencesToolbar.html

77
src/webui/api/appcontroller.cpp
Unescape View File

@ -107,6 +107,19 @@ void AppController::preferencesAction() @@ -107,6 +107,19 @@ void AppController::preferencesAction()
QJsonObject data;
// Behavior
// Language
data[u"locale"_qs] = pref->getLocale();
data[u"performance_warning"_qs] = session->isPerformanceWarningEnabled();
// Log file
data[u"file_log_enabled"_qs] = app()->isFileLoggerEnabled();
data[u"file_log_path"_qs] = app()->fileLoggerPath().toString();
data[u"file_log_backup_enabled"_qs] = app()->isFileLoggerBackup();
data[u"file_log_max_size"_qs] = app()->fileLoggerMaxSize() / 1024;
data[u"file_log_delete_old"_qs] = app()->isFileLoggerDeleteOld();
data[u"file_log_age"_qs] = app()->fileLoggerAge();
data[u"file_log_age_type"_qs] = app()->fileLoggerAgeType();
// Downloads
// When adding a torrent
data[u"torrent_content_layout"_qs] = Utils::String::fromEnum(session->torrentContentLayout());
@ -247,9 +260,6 @@ void AppController::preferencesAction() @@ -247,9 +260,6 @@ void AppController::preferencesAction()
data[u"add_trackers"_qs] = session->additionalTrackers();
// Web UI
// Language
data[u"locale"_qs] = pref->getLocale();
data[u"performance_warning"_qs] = session->isPerformanceWarningEnabled();
// HTTP Server
data[u"web_ui_domain_list"_qs] = pref->getServerDomains();
data[u"web_ui_address"_qs] = pref->getWebUiAddress();
@ -411,6 +421,45 @@ void AppController::setPreferencesAction() @@ -411,6 +421,45 @@ void AppController::setPreferencesAction()
return (it != m.constEnd());
};
// Behavior
// Language
if (hasKey(u"locale"_qs))
{
QString locale = it.value().toString();
if (pref->getLocale() != locale)
{
auto *translator = new QTranslator;
if (translator->load(u":/lang/qbittorrent_"_qs + locale))
{
qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
}
else
{
qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));
}
qApp->installTranslator(translator);
pref->setLocale(locale);
}
}
if (hasKey(u"performance_warning"_qs))
session->setPerformanceWarningEnabled(it.value().toBool());
// Log file
if (hasKey(u"file_log_enabled"_qs))
app()->setFileLoggerEnabled(it.value().toBool());
if (hasKey(u"file_log_path"_qs))
app()->setFileLoggerPath(Path(it.value().toString()));
if (hasKey(u"file_log_backup_enabled"_qs))
app()->setFileLoggerBackup(it.value().toBool());
if (hasKey(u"file_log_max_size"_qs))
app()->setFileLoggerMaxSize(it.value().toInt() * 1024);
if (hasKey(u"file_log_delete_old"_qs))
app()->setFileLoggerDeleteOld(it.value().toBool());
if (hasKey(u"file_log_age"_qs))
app()->setFileLoggerAge(it.value().toInt());
if (hasKey(u"file_log_age_type"_qs))
app()->setFileLoggerAgeType(it.value().toInt());
// Downloads
// When adding a torrent
if (hasKey(u"torrent_content_layout"_qs))
@ -673,28 +722,6 @@ void AppController::setPreferencesAction() @@ -673,28 +722,6 @@ void AppController::setPreferencesAction()
session->setAdditionalTrackers(it.value().toString());
// Web UI
// Language
if (hasKey(u"locale"_qs))
{
QString locale = it.value().toString();
if (pref->getLocale() != locale)
{
auto *translator = new QTranslator;
if (translator->load(u":/lang/qbittorrent_"_qs + locale))
{
qDebug("%s locale recognized, using translation.", qUtf8Printable(locale));
}
else
{
qDebug("%s locale unrecognized, using default (en).", qUtf8Printable(locale));
}
qApp->installTranslator(translator);
pref->setLocale(locale);
}
}
if (hasKey(u"performance_warning"_qs))
session->setPerformanceWarningEnabled(it.value().toBool());
// HTTP Server
if (hasKey(u"web_ui_domain_list"_qs))
pref->setServerDomains(it.value().toString());

2
src/webui/webapplication.h
Unescape View File

@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
#include "base/utils/version.h"
#include "api/isessionmanager.h"
inline const Utils::Version<3, 2> API_VERSION {2, 8, 19};
inline const Utils::Version<3, 2> API_VERSION {2, 8, 20};
class APIController;
class AuthController;

117
src/webui/www/private/views/preferences.html
Unescape View File

@ -1,4 +1,49 @@ @@ -1,4 +1,49 @@
<div id="DownloadsTab" class="PrefTab">
<div id="BehaviorTab" class="PrefTab">
<fieldset class="settings">
<legend>QBT_TR(Language)QBT_TR[CONTEXT=OptionsDialog]</legend>
<label for="locale_select">QBT_TR(User Interface Language:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="locale_select">
${LANGUAGE_OPTIONS}
</select>
</fieldset>
<fieldset class="settings">
<legend>
<input type="checkbox" id="filelog_checkbox" onclick="qBittorrent.Preferences.updateFileLogEnabled();" />
<label for="filelog_checkbox">QBT_TR(Log file)QBT_TR[CONTEXT=OptionsDialog]</label>
</legend>
<div class="formRow">
<label for="filelog_save_path_input">QBT_TR(Save path:)QBT_TR[CONTEXT=OptionsDialog]</label>
<input type="text" id="filelog_save_path_input" />
</div>
<table>
<tr>
<td><input type="checkbox" id="filelog_backup_checkbox" onclick="qBittorrent.Preferences.updateFileLogBackupEnabled();" /></td>
<td><label for="filelog_backup_checkbox">QBT_TR(Backup the log file after:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
<td><input id="filelog_max_size_input" type=number min="1" max="1024000" value="65" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />QBT_TR(KiB)QBT_TR[CONTEXT=OptionsDialog]</td>
</tr>
<tr>
<td><input type="checkbox" id="filelog_delete_old_checkbox" onclick="qBittorrent.Preferences.updateFileLogDeleteEnabled();" /></td>
<td><label for="filelog_delete_old_checkbox">QBT_TR(Delete backup logs older than:)QBT_TR[CONTEXT=OptionsDialog]</label></td>
<td>
<input type=number min="1" max="365" value="6" id="filelog_age_input" onchange="qBittorrent.Preferences.numberInputLimiter(this);" />
<select id="filelog_age_type_select">
<option value="0">QBT_TR(days)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="1" selected>QBT_TR(months)QBT_TR[CONTEXT=OptionsDialog]</option>
<option value="2">QBT_TR(years)QBT_TR[CONTEXT=OptionsDialog]</option>
</select>
</td>
</tr>
</table>
</fieldset>
<div class="formRow">
<input type="checkbox" id="performanceWarning" />
<label for="performanceWarning">QBT_TR(Log performance warnings)QBT_TR[CONTEXT=OptionsDialog]</label>
</div>
</div>
<div id="DownloadsTab" class="PrefTab invisible">
<fieldset class="settings">
<legend>QBT_TR(When adding a torrent)QBT_TR[CONTEXT=OptionsDialog]</legend>
<div class="formRow">
@ -662,19 +707,6 @@ @@ -662,19 +707,6 @@
</div>
<div id="WebUITab" class="PrefTab invisible">
<fieldset class="settings">
<legend>QBT_TR(Language)QBT_TR[CONTEXT=OptionsDialog]</legend>
<label for="locale_select">QBT_TR(User Interface Language:)QBT_TR[CONTEXT=OptionsDialog]</label>
<select id="locale_select">
${LANGUAGE_OPTIONS}
</select>
</fieldset>
<div class="formRow">
<input type="checkbox" id="performanceWarning" />
<label for="performanceWarning">QBT_TR(Log performance warnings)QBT_TR[CONTEXT=OptionsDialog]</label>
</div>
<fieldset class="settings">
<legend>QBT_TR(Web User Interface (Remote control))QBT_TR[CONTEXT=OptionsDialog]</legend>
<table>
@ -1334,6 +1366,10 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD @@ -1334,6 +1366,10 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
window.qBittorrent.Preferences = (function() {
const exports = function() {
return {
numberInputLimiter: numberInputLimiter,
updateFileLogEnabled: updateFileLogEnabled,
updateFileLogBackupEnabled: updateFileLogBackupEnabled,
updateFileLogDeleteEnabled: updateFileLogDeleteEnabled,
updateTempDirEnabled: updateTempDirEnabled,
updateExportDirEnabled: updateExportDirEnabled,
updateExportDirFinEnabled: updateExportDirFinEnabled,
@ -1370,6 +1406,39 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD @@ -1370,6 +1406,39 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
};
};
// Behavior tab
const numberInputLimiter = (input) => {
const min = input.getAttribute("min");
const max = input.getAttribute("max");
if (min && input.value.toInt() < min.toInt())
input.value = min;
if (max && input.value.toInt() > max.toInt())
input.value = max;
};
const updateFileLogEnabled = function() {
const isFileLogEnabled = $('filelog_checkbox').getProperty('checked');
$('filelog_save_path_input').setProperty('disabled', !isFileLogEnabled);
$('filelog_backup_checkbox').setProperty('disabled', !isFileLogEnabled);
$('filelog_delete_old_checkbox').setProperty('disabled', !isFileLogEnabled);
updateFileLogBackupEnabled();
updateFileLogDeleteEnabled();
};
const updateFileLogBackupEnabled = function() {
const pros = $('filelog_backup_checkbox').getProperties('disabled', 'checked');
$('filelog_max_size_input').setProperty('disabled', pros.disabled || !pros.checked);
};
const updateFileLogDeleteEnabled = function() {
const pros = $('filelog_delete_old_checkbox').getProperties('disabled', 'checked');
$('filelog_age_input').setProperty('disabled', pros.disabled || !pros.checked);
$('filelog_age_type_select').setProperty('disabled', pros.disabled || !pros.checked);
};
// Downloads tab
const watchedFoldersTable = new HtmlTable($("watched_folders_tab"));
@ -1717,6 +1786,16 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD @@ -1717,6 +1786,16 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
},
onSuccess: function(pref) {
if (pref) {
// Behavior tab
$('filelog_checkbox').setProperty('checked', pref.file_log_enabled);
$('filelog_save_path_input').setProperty('value', pref.file_log_path);
$('filelog_backup_checkbox').setProperty('checked', pref.file_log_backup_enabled);
$('filelog_max_size_input').setProperty('value', pref.file_log_max_size);
$('filelog_delete_old_checkbox').setProperty('checked', pref.file_log_delete_old);
$('filelog_age_input').setProperty('value', pref.file_log_age);
$('filelog_age_type_select').setProperty('value', pref.file_log_age_type);
updateFileLogEnabled();
// Downloads tab
// When adding a torrent
let index = 0;
@ -2097,6 +2176,16 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD @@ -2097,6 +2176,16 @@ Use ';' to split multiple entries. Can use wildcard '*'.)QBT_TR[CONTEXT=OptionsD
const applyPreferences = function() {
const settings = new Hash();
// Validate form data
// Behavior tab
settings.set('file_log_enabled', $('filelog_checkbox').getProperty('checked'));
settings.set('file_log_path', $('filelog_save_path_input').getProperty('value'));
settings.set('file_log_backup_enabled', $('filelog_backup_checkbox').getProperty('checked'));
settings.set('file_log_max_size', $('filelog_max_size_input').getProperty('value'));
settings.set('file_log_delete_old', $('filelog_delete_old_checkbox').getProperty('checked'));
settings.set('file_log_age', $('filelog_age_input').getProperty('value'));
settings.set('file_log_age_type', $('filelog_age_type_select').getProperty('value'));
// Downloads tab
// When adding a torrent
settings.set('torrent_content_layout', $('contentlayout_select').getSelected()[0].getProperty('value'));

7
src/webui/www/private/views/preferencesToolbar.html
Unescape View File

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
<!-- preferences -->
<div class="toolbarTabs">
<ul id="preferencesTabs" class="tab-menu">
<li id="PrefDownloadsLink" class="selected"><a>QBT_TR(Downloads)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefBehaviorLink" class="selected"><a>QBT_TR(Behavior)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefDownloadsLink"><a>QBT_TR(Downloads)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefConnectionLink"><a>QBT_TR(Connection)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefSpeedLink"><a>QBT_TR(Speed)QBT_TR[CONTEXT=OptionsDialog]</a></li>
<li id="PrefBittorrentLink"><a>QBT_TR(BitTorrent)QBT_TR[CONTEXT=OptionsDialog]</a></li>
@ -19,6 +20,10 @@ @@ -19,6 +20,10 @@
// Tabs
MochaUI.initializeTabs('preferencesTabs');
$('PrefBehaviorLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('BehaviorTab').removeClass('invisible');
});
$('PrefDownloadsLink').addEvent('click', function(e) {
$$('.PrefTab').addClass('invisible');
$('DownloadsTab').removeClass('invisible');

Write Preview
Loading…
Cancel
Save