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

WebUI: use new format of RSS rules 

PR #19326.
Fixes regression of #18824.
Closes #19323.
adaptive-webui-19844
Vladimir Golovnev 1 year ago committed by GitHub
parent
0f0de5e4f8
commit
9171b73edb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 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. 44
      src/webui/www/private/views/rssDownloader.html

44
src/webui/www/private/views/rssDownloader.html
Unescape View File

@ -577,41 +577,41 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
rulesList[rule].mustNotContain = $('mustNotContainText').value; rulesList[rule].mustNotContain = $('mustNotContainText').value;
rulesList[rule].episodeFilter = $('episodeFilterText').value; rulesList[rule].episodeFilter = $('episodeFilterText').value;
rulesList[rule].smartFilter = $('useSmartFilter').checked; rulesList[rule].smartFilter = $('useSmartFilter').checked;
rulesList[rule].assignedCategory = $('assignCategoryCombobox').value;
rulesList[rule].savePath = $('savetoDifferentDir').checked ? $('saveToText').value : '';
rulesList[rule].ignoreDays = parseInt($('ignoreDaysValue').value); rulesList[rule].ignoreDays = parseInt($('ignoreDaysValue').value);
rulesList[rule].affectedFeeds = rssDownloaderFeedSelectionTable.rows.filter((row) => row.full_data.checked)
.map((row) => row.full_data.url)
.getValues();
rulesList[rule].torrentParams.category = $('assignCategoryCombobox').value;
rulesList[rule].torrentParams.save_path = $('savetoDifferentDir').checked ? $('saveToText').value : '';
switch ($('addPausedCombobox').value) { switch ($('addPausedCombobox').value) {
case 'default': case 'default':
rulesList[rule].addPaused = null; rulesList[rule].torrentParams.stopped = null;
break; break;
case 'always': case 'always':
rulesList[rule].addPaused = true; rulesList[rule].torrentParams.stopped = true;
break; break;
case 'never': case 'never':
rulesList[rule].addPaused = false; rulesList[rule].torrentParams.stopped = false;
break; break;
} }
switch ($('contentLayoutCombobox').value) { switch ($('contentLayoutCombobox').value) {
case 'Default': case 'Default':
rulesList[rule].torrentContentLayout = null; rulesList[rule].torrentParams.content_layout = null;
break; break;
case 'Original': case 'Original':
rulesList[rule].torrentContentLayout = 'Original'; rulesList[rule].torrentParams.content_layout = 'Original';
break; break;
case 'Subfolder': case 'Subfolder':
rulesList[rule].torrentContentLayout = 'Subfolder'; rulesList[rule].torrentParams.content_layout = 'Subfolder';
break; break;
case 'NoSubfolder': case 'NoSubfolder':
rulesList[rule].torrentContentLayout = 'NoSubfolder'; rulesList[rule].torrentParams.content_layout = 'NoSubfolder';
break; break;
} }
rulesList[rule].affectedFeeds = rssDownloaderFeedSelectionTable.rows.filter((row) => row.full_data.checked)
.map((row) => row.full_data.url)
.getValues();
new Request({ new Request({
url: 'api/v2/rss/setRule', url: 'api/v2/rss/setRule',
noCache: true, noCache: true,
@ -702,8 +702,8 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
$('useSmartFilter').disabled = false; $('useSmartFilter').disabled = false;
$('assignCategoryCombobox').disabled = false; $('assignCategoryCombobox').disabled = false;
$('savetoDifferentDir').disabled = false; $('savetoDifferentDir').disabled = false;
$('savetoDifferentDir').checked = rulesList[ruleName].savePath ? false : true; $('savetoDifferentDir').checked = rulesList[ruleName].torrentParams.save_path ? false : true;
$('saveToText').disabled = rulesList[ruleName].savePath ? false : true; $('saveToText').disabled = rulesList[ruleName].torrentParams.save_path ? false : true;
$('ignoreDaysValue').disabled = false; $('ignoreDaysValue').disabled = false;
$('addPausedCombobox').disabled = false; $('addPausedCombobox').disabled = false;
$('contentLayoutCombobox').disabled = false; $('contentLayoutCombobox').disabled = false;
@ -715,9 +715,9 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
$('episodeFilterText').value = rulesList[ruleName].episodeFilter; $('episodeFilterText').value = rulesList[ruleName].episodeFilter;
$('useSmartFilter').checked = rulesList[ruleName].smartFilter; $('useSmartFilter').checked = rulesList[ruleName].smartFilter;
$('assignCategoryCombobox').value = rulesList[ruleName].assignedCategory ? rulesList[ruleName].assignedCategory : 'default'; $('assignCategoryCombobox').value = rulesList[ruleName].torrentParams.category ? rulesList[ruleName].torrentParams.category : 'default';
$('savetoDifferentDir').checked = rulesList[ruleName].savePath !== ''; $('savetoDifferentDir').checked = rulesList[ruleName].torrentParams.save_path !== '';
$('saveToText').value = rulesList[ruleName].savePath; $('saveToText').value = rulesList[ruleName].torrentParams.save_path;
$('ignoreDaysValue').value = rulesList[ruleName].ignoreDays; $('ignoreDaysValue').value = rulesList[ruleName].ignoreDays;
// calculate days since last match // calculate days since last match
@ -730,15 +730,15 @@ Supports the formats: S01E01, 1x1, 2017.12.31 and 31.12.2017 (Date formats also
$('lastMatchText').textContent = 'QBT_TR(Last Match: Unknown)QBT_TR[CONTEXT=AutomatedRssDownloader]'; $('lastMatchText').textContent = 'QBT_TR(Last Match: Unknown)QBT_TR[CONTEXT=AutomatedRssDownloader]';
} }
if (rulesList[ruleName].addPaused === null) if (rulesList[ruleName].torrentParams.stopped === null)
$('addPausedCombobox').value = 'default'; $('addPausedCombobox').value = 'default';
else else
$('addPausedCombobox').value = rulesList[ruleName].addPaused ? 'always' : 'never'; $('addPausedCombobox').value = rulesList[ruleName].torrentParams.stopped ? 'always' : 'never';
if (rulesList[ruleName].torrentContentLayout === null) if (rulesList[ruleName].torrentParams.content_layout === null)
$('contentLayoutCombobox').value = 'Default'; $('contentLayoutCombobox').value = 'Default';
else else
$('contentLayoutCombobox').value = rulesList[ruleName].torrentContentLayout; $('contentLayoutCombobox').value = rulesList[ruleName].torrentParams.content_layout;
setElementTitles(); setElementTitles();

Write Preview
Loading…
Cancel
Save