#for $curStatus in sorted($Quality.DOWNLOADED)
#if $DOWNLOADED != $curStatus
- $re.sub('Downloaded\s*\(([^\)]+)\)', r'\1', $statusStrings[$curStatus])
+ $re.sub('Downloaded\s*\(([^\)]+)\)', r'\1', $statusStrings[$curStatus].replace('SD DVD', 'SD DVD/BR/BD'))
#end if
#end for
with archived quality
diff --git a/gui/slick/interfaces/default/editShow.tmpl b/gui/slick/interfaces/default/editShow.tmpl
index 22317152..c023daa5 100644
--- a/gui/slick/interfaces/default/editShow.tmpl
+++ b/gui/slick/interfaces/default/editShow.tmpl
@@ -146,17 +146,17 @@
#set $qualities = $common.Quality.splitQuality(int($show.quality))
-#set global $anyQualities = $qualities[0]
-#set global $bestQualities = $qualities[1]
+#set global $any_qualities = $qualities[0]
+#set global $best_qualities = $qualities[1]
#include $os.path.join($sg_str('PROG_DIR'), 'gui/slick/interfaces/default/inc_qualityChooser.tmpl')
-#if $anyQualities + $bestQualities
+#if $any_qualities + $best_qualities
diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl
index 2ff7a49b..a78f262c 100644
--- a/gui/slick/interfaces/default/history.tmpl
+++ b/gui/slick/interfaces/default/history.tmpl
@@ -134,7 +134,7 @@
#if $SUBTITLED == $curStatus
">
#end if
-
$statusStrings[$curStatus]
+
$statusStrings[$curStatus].replace('SD DVD', 'SD DVD/BR/BD')
#if $DOWNLOADED == $curStatus
@@ -156,7 +156,7 @@
#end if
#end if
-
$curQuality $Quality.qualityStrings[$curQuality]
+
$curQuality $Quality.get_quality_ui($curQuality)
#end for
@@ -258,7 +258,7 @@
#end for
#end if
-
$Quality.qualityStrings[$curQuality]
+
$Quality.get_quality_ui($curQuality)
#end for
diff --git a/gui/slick/interfaces/default/home_addExistingShow.tmpl b/gui/slick/interfaces/default/home_addExistingShow.tmpl
index 572a07e7..23f3a87b 100644
--- a/gui/slick/interfaces/default/home_addExistingShow.tmpl
+++ b/gui/slick/interfaces/default/home_addExistingShow.tmpl
@@ -8,6 +8,7 @@
#set global $sbPath = '../..'
#set global $statpath = '../..'
#set global $topmenu = 'home'
+#set global $page_body_attr = 'import-shows"'
##
#import os.path
#include $os.path.join($sg_str('PROG_DIR'), 'gui/slick/interfaces/default/inc_top.tmpl')
diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
index a25e571d..46e6e703 100644
--- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl
+++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
@@ -9,7 +9,7 @@
<% def sg_str(varname, default=''): return getattr(sickbeard, varname, default) %>#slurp#
-
+
To reuse options below when adding more shows
@@ -19,7 +19,7 @@
#for $curStatus in [$SKIPPED, $WANTED, $ARCHIVED, $IGNORED]:
- $statusStrings[$curStatus]
+ $statusStrings[$curStatus].replace('SD DVD', 'SD DVD/BR/BD')
#end for
set the initial status of missing episodes
@@ -33,8 +33,8 @@
#set $qualities = $Quality.splitQuality($sg_var('QUALITY_DEFAULT', SD))
-#set global $anyQualities = $qualities[0]
-#set global $bestQualities = $qualities[1]
+#set global $any_qualities = $qualities[0]
+#set global $best_qualities = $qualities[1]
#include $os.path.join($sg_str('PROG_DIR'), 'gui/slick/interfaces/default/inc_qualityChooser.tmpl')
diff --git a/gui/slick/interfaces/default/inc_blackwhitelist.tmpl b/gui/slick/interfaces/default/inc_blackwhitelist.tmpl
index 04430615..0d21d8ba 100644
--- a/gui/slick/interfaces/default/inc_blackwhitelist.tmpl
+++ b/gui/slick/interfaces/default/inc_blackwhitelist.tmpl
@@ -19,8 +19,8 @@
#end for
-
@@ -34,8 +34,8 @@
#end for
-
#if $SUBTITLED == $curStatus#$Quality.qualityStrings[$curQuality]
+ #if $SUBTITLED == $curStatus#$Quality.get_quality_ui($curQuality)
#else
- $statusStrings[$curStatus]
+ $statusStrings[$curStatus].replace('SD DVD', 'SD DVD/BR/BD')
#end if
#if 0 != int($ep['season'])
diff --git a/gui/slick/interfaces/default/inc_qualityChooser.tmpl b/gui/slick/interfaces/default/inc_qualityChooser.tmpl
index 33cb6403..60aa8971 100644
--- a/gui/slick/interfaces/default/inc_qualityChooser.tmpl
+++ b/gui/slick/interfaces/default/inc_qualityChooser.tmpl
@@ -3,15 +3,15 @@
#set $html_selected = ' selected="selected"'
-
-#set $overall_quality = $Quality.combineQualities($anyQualities, $bestQualities)
+
+#set $overall_quality = $Quality.combineQualities($any_qualities, $best_qualities)
Quality to download
#set $selected = None
-
+
Custom
-#for $curPreset in $qualityPresets:
- $qualityPresetStrings[$curPreset]
+#for $cur_preset in $qualityPresets:
+ $qualityPresetStrings[$cur_preset]
#end for
tip: select a quality then "Custom" for a default selection
@@ -19,43 +19,76 @@
-
-
-
-
An Initial quality downloads before any Upgrade to selections are considered.
-
Deselect all Upgrade to qualities to keep the first best Initial release found.
-
All found Upgrade to qualities download until the best.
+
+
+
+
+
An initial quality downloads before optional upgrades
+
+
+ Temporarily use 'Unknown' to skip release qual checks.
+ Results in spam if left on
+
+
+
+
+ Select one or more qualities; the best one found when searching will be snatched
+#set $any_quality_list = filter(lambda x: x > $Quality.NONE and x < $Quality.UNKNOWN, $Quality.qualityStrings)
+#set $has_unknown = False
+#for $cur_quality in sorted($any_quality_list):
+ ##set $has_unknown |= ($Quality.UNKNOWN == $cur_quality and $cur_quality in $any_qualities)
+
-
+
+
+
All found upgrade qualities download until the best
+
+
No upgrades selected, an initial snatch will complete any search
+
An upgrade will only search after an initial has complete
+
+
+ Optional, upgrade a completed download to any selected quality
+#set $best_quality_list = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
+#for $cur_quality in sorted($best_quality_list):
+
+
Initial
-#set $anyQualityList = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings)
-
-#set $has_unknown = False
-#for $curQuality in sorted($anyQualityList):
- #set $has_unknown |= ($Quality.UNKNOWN == $curQuality and $curQuality in $anyQualities)
- $Quality.qualityStrings[$curQuality]
+#set $any_quality_list = filter(lambda x: x > $Quality.NONE, $Quality.qualityStrings)
+
+#for $cur_quality in sorted($any_quality_list):
+ $Quality.get_quality_ui($cur_quality)
#end for
Upgrade to
-#set $bestQualityList = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
-
-#for $curQuality in sorted($bestQualityList):
- $Quality.qualityStrings[$curQuality]
+#set $best_quality_list = filter(lambda x: x > $Quality.SDTV and x < $Quality.UNKNOWN, $Quality.qualityStrings)
+
+#for $cur_quality in sorted($best_quality_list):
+ $Quality.get_quality_ui($cur_quality)
#end for
Ctrl + Click = toggle a quality
-
-
-
-
- Note: Temporarily use 'Unknown' for releases with no recognised quality.
- Full-time use risks snatching bad releases and wastes API hits.
-
diff --git a/gui/slick/interfaces/default/manage_massEdit.tmpl b/gui/slick/interfaces/default/manage_massEdit.tmpl
index 0a1125d4..064e711e 100644
--- a/gui/slick/interfaces/default/manage_massEdit.tmpl
+++ b/gui/slick/interfaces/default/manage_massEdit.tmpl
@@ -53,7 +53,7 @@
Quality
-
+
< keep >
Custom
#for $curPreset in sorted($common.qualityPresets):
@@ -62,22 +62,22 @@
-
+
Initial
#set $anyQualityList = filter(lambda x: x > $common.Quality.NONE, $common.Quality.qualityStrings)
-
+
#for $curQuality in sorted($anyQualityList):
- $common.Quality.qualityStrings[$curQuality]
+ $common.Quality.get_quality_ui($curQuality)
#end for
Upgrade to
#set $bestQualityList = filter(lambda x: x > $common.Quality.SDTV, $common.Quality.qualityStrings)
-
+
#for $curQuality in sorted($bestQualityList):
- $common.Quality.qualityStrings[$curQuality]
+ $common.Quality.get_quality_ui($curQuality)
#end for
diff --git a/gui/slick/js/addShowOptions.js b/gui/slick/js/addShowOptions.js
index 207e1c81..fd5d2fe9 100644
--- a/gui/slick/js/addShowOptions.js
+++ b/gui/slick/js/addShowOptions.js
@@ -3,10 +3,10 @@ $(document).ready(function(){
$('#saveDefaultsButton').click(function() {
var anyQualArray = [], bestQualArray = [];
- $('#anyQualities option:selected').each(function(i, d) {
+ $('#initial-qualities option:selected').each(function(i, d) {
anyQualArray.push($(d).val());
});
- $('#bestQualities option:selected').each(function(i, d) {
+ $('#upgrade-qualities option:selected').each(function(i, d) {
bestQualArray.push($(d).val());
});
@@ -32,9 +32,9 @@ $(document).ready(function(){
$(this).attr('disabled', true);
});
- $('#statusSelect, #qualityPreset, #anyQualities, #bestQualities, #wanted_begin, #wanted_latest,'
+ $('#statusSelect, #quality-preset, #initial-qualities, #upgrade-qualities, #wanted_begin, #wanted_latest,'
+ ' #flatten_folders, #scene, #subtitles, #anime, #tag').change(function() {
$('#saveDefaultsButton').attr('disabled', false);
});
-});
\ No newline at end of file
+});
diff --git a/gui/slick/js/newShow.js b/gui/slick/js/newShow.js
index 69c8c506..4c1cc1cb 100644
--- a/gui/slick/js/newShow.js
+++ b/gui/slick/js/newShow.js
@@ -251,7 +251,7 @@ $(document).ready(function () {
$('#addShowForm').submit();
});
- $('#qualityPreset').change(function () {
+ $('#quality-preset').change(function () {
myform.loadsection(2);
});
diff --git a/gui/slick/js/qualityChooser.js b/gui/slick/js/qualityChooser.js
index 58aa541d..341b678c 100644
--- a/gui/slick/js/qualityChooser.js
+++ b/gui/slick/js/qualityChooser.js
@@ -1,12 +1,12 @@
function setFromPresets (preset) {
var elCustomQuality = $('.show-if-quality-custom'),
- selected = 'selected';
+ selected = 'selected', quality, selectState, btn$, dev = !1;
if (preset = parseInt(preset)) {
- elCustomQuality.fadeOut('fast', 'linear');
+ !dev && elCustomQuality.fadeOut('fast', 'linear');
var upgrade = !0;
- $('#anyQualities, #bestQualities').find('option').each(function() {
- if (upgrade && 'bestQualities' === $(this).parent().attr('id')) {
+ $('#initial-qualities, #upgrade-qualities').find('option').each(function() {
+ if (upgrade && 'upgrade-qualities' === $(this).parent().attr('id')) {
upgrade = !1;
switch (preset) {
case 3: preset = 128 + 32 + 4; break;
@@ -15,8 +15,22 @@ function setFromPresets (preset) {
default: preset = 0;
}
}
- $(this).attr(selected, ((preset & parseInt($(this).val())) ? selected : false));
+
+ quality = $(this).val();
+ selectState = ((preset & parseInt(quality, 10)) ? selected : !1);
+ $(this).attr(selected, selectState);
+
+ var list = /initial/.test($(this).parent().attr('id')) ? '#initial-quality': '#upgrade-quality';
+ btn$ = $(/initial/.test($(this).parent().attr('id')) ? '#initial-quality': '#upgrade-quality').find('a.btn[data-quality="' + quality + '"]');
+ if(!selectState){
+ btn$.removeClass('active')
+
+ } else {
+ btn$.addClass('active')
+ }
+ dev && console.log(preset, list, 'this.val():', quality, 'selectState:', selectState, 'hasClass:', btn$.hasClass('active'))
});
+ dev && console.log('-----------------------');
} else
elCustomQuality.fadeIn('fast', 'linear');
@@ -24,16 +38,23 @@ function setFromPresets (preset) {
}
function presentTips() {
- var tip$ = $('#unknown');
- if (/undefined/i.test($('#anyQualities').find('option[value="32768"]').attr('selected'))) {
- tip$.fadeOut('fast', 'linear');
- } else {
+ var tip$ = $('#unknown-quality');
+ if ($('#initial-quality').find('a.btn[data-quality="32768"]').hasClass('active')) {
tip$.fadeIn('fast', 'linear');
+ } else {
+ tip$.fadeOut('fast', 'linear');
+ }
+
+ var tip$ = $('#no-upgrade'), tip2$ = $('#upgrade-cond');
+ if ($('#upgrade-quality').find('a.btn').hasClass('active')) {
+ tip$.fadeOut('fast', 'linear', function(){tip2$.fadeIn('fast', 'linear');});
+ } else {
+ tip2$.fadeOut('fast', 'linear', function(){tip$.fadeIn('fast', 'linear');});
}
}
-$(document).ready(function() {
- var elQualityPreset = $('#qualityPreset'),
+$(function() {
+ var elQualityPreset = $('#quality-preset'),
selected = ':selected';
elQualityPreset.change(function() {
@@ -42,7 +63,29 @@ $(document).ready(function() {
setFromPresets(elQualityPreset.find(selected).val());
- $('#anyQualities').change(function() {
+ $('#initial-qualities').change(function() {
presentTips();
});
+
+ $('#custom-quality').find('a[href="#"].btn').on('click', function(event){
+ event.stopPropagation();
+
+ $(this).toggleClass('active');
+
+ var select$ = $('initial-quality' === $(this).closest('.component-desc').attr('id') ? '#initial-qualities' : '#upgrade-qualities'),
+ quality = $(this).data('quality'), arrSelected = $.map(select$.val(), function(v){return parseInt(v, 10)}) || Array();
+
+ if($(this).hasClass('active')){
+ arrSelected.push(quality);
+ } else {
+ arrSelected = arrSelected.filter(function(elem){
+ return elem !== quality;
+ });
+ }
+
+ select$.val(arrSelected).change();
+
+ presentTips();
+ return !1;
+ });
});
diff --git a/sickbeard/common.py b/sickbeard/common.py
index 75a57104..88c68317 100644
--- a/sickbeard/common.py
+++ b/sickbeard/common.py
@@ -151,6 +151,10 @@ class Quality:
return (Quality.qualityStrings[quality].replace('2160p', 'UHD2160p').replace('1080p', 'HD1080p')
.replace('720p', 'HD720p').replace('HD TV', 'HD720p').replace('RawHD TV', 'RawHD'))
+ @staticmethod
+ def get_quality_ui(quality):
+ return Quality.qualityStrings[quality].replace('SD DVD', 'SD DVD/BR/BD')
+
@staticmethod
def _getStatusStrings(status):
toReturn = {}
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 079b3e9f..19919e62 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -1480,7 +1480,7 @@ class Home(MainHandler):
indexerid = int(showObj.indexerid)
indexer = int(showObj.indexer)
- t.min_initial = Quality.qualityStrings[min(Quality.splitQuality(showObj.quality)[0])]
+ t.min_initial = Quality.get_quality_ui(min(Quality.splitQuality(showObj.quality)[0]))
t.all_scene_exceptions = showObj.exceptions
t.scene_numbering = get_scene_numbering_for_show(indexerid, indexer)
t.scene_absolute_numbering = get_scene_absolute_numbering_for_show(indexerid, indexer)