Merge branch 'hotfix/0.22.3'

CHANGES.md

@@ -1,4 +1,12 @@
-### 0.22.2 (2020-09-25 09:00:00 UTC)
+### 0.22.3 (2020-10-14 15:00:00 UTC)
+
+* Fix use qualities saved as default during Add Show to set up qualities in Bulk Change
+* Fix add manual indents to Quality dropdown select that browsers removed from CSS styles
+* Change allow Python 3.9.0
+* Fix English flag
+
+
+### 0.22.2 (2020-09-25 09:00:00 UTC)
 
 * Change allow Python 3.8.6
 * Fix show saved require word list to require at least one word during search

gui/slick/interfaces/default/inc_qualityChooser.tmpl

@@ -13,7 +13,7 @@
 			<select id="quality-preset" name="quality_preset" class="form-control form-control-inline input-sm">
 				<option value="0">Custom</option>
 #for $cur_preset in $qualityPresets:
-				<option value="$cur_preset"#echo ('', $html_selected)[$cur_preset == $overall_quality]##echo ('', ' style="padding-left:15px"')[$qualityPresetStrings[$cur_preset].endswith('0p') and 'UHD' not in $qualityPresetStrings[$cur_preset]]#>$qualityPresetStrings[$cur_preset]</option>
+				<option value="$cur_preset"#echo ('', $html_selected)[$cur_preset == $overall_quality]##echo ('>', '>... ')[$qualityPresetStrings[$cur_preset].endswith('0p') and 'UHD' not in $qualityPresetStrings[$cur_preset]]#$qualityPresetStrings[$cur_preset]</option>
 #end for
 			</select>
 			<span>tip: select a quality then "Custom" for a default selection</span>

gui/slick/interfaces/default/manage_massEdit.tmpl

@@ -1,5 +1,5 @@
 #import sickbeard
-#from sickbeard import common
+#from sickbeard.common import Quality, qualityPresets, qualityPresetStrings, SD
 #from lib import exceptions_helper as exceptions
 #from _23 import filter_list
 <% def sg_var(varname, default=False): return getattr(sickbeard, varname, default) %>#slurp#
@@ -16,9 +16,9 @@
 #if None is not $quality_value:
     #set $initial_quality = int($quality_value)
 #else:
-    #set $initial_quality = $common.SD
+    #set $initial_quality = $SD
 #end if
-#set $anyQualities, $bestQualities = $common.Quality.splitQuality($initial_quality)
+#set $anyQualities, $bestQualities = $Quality.splitQuality($sg_var('QUALITY_DEFAULT', $initial_quality))
 <script type="text/javascript" src="$sbRoot/js/qualityChooser.js?v=$sbPID"></script>
 <script type="text/javascript" src="$sbRoot/js/massEdit.js?v=$sbPID"></script>
 
@@ -58,9 +58,9 @@
 		<div class="selectChoices">
 			<select id="quality-preset" name="quality_preset" class="form-control form-control-inline input-sm">
 				<option value="keep">&lt; keep &gt;</option>
-				<option value="0"  #if None is not $quality_value and $quality_value not in $common.qualityPresets then $selected else ''#>Custom</option>
+				<option value="0"  #if None is not $quality_value and $quality_value not in $qualityPresets then $selected else ''#>Custom</option>
-#for $curPreset in sorted($common.qualityPresets):
+#for $curPreset in $qualityPresets:
-				<option value="$curPreset" #if $quality_value == $curPreset then $selected else ''#>$common.qualityPresetStrings[$curPreset]</option>
+				<option value="$curPreset" #if $quality_value == $curPreset then $selected else ''##echo ('>', '>... ')[$qualityPresetStrings[$curPreset].endswith('0p') and 'UHD' not in $qualityPresetStrings[$curPreset]]#$qualityPresetStrings[$curPreset]</option>
 #end for
 			</select>
 		</div><br />
@@ -68,19 +68,19 @@
 		<div id="custom-quality" class="show-if-quality-custom">
 			<div class="manageCustom pull-left">
 				<h4 style="font-size:14px">Initial</h4>
-#set $anyQualityList = filter_list(lambda x: x > $common.Quality.NONE, $common.Quality.qualityStrings)
+#set $anyQualityList = filter_list(lambda x: x > $Quality.NONE, $Quality.qualityStrings)
 				<select id="wanted-qualities" name="any_qualities" multiple="multiple" size="$len($anyQualityList)">
 #for $curQuality in sorted($anyQualityList):
-					<option value="$curQuality" #if $curQuality in $anyQualities then $selected else ''#>$common.Quality.get_quality_ui($curQuality)</option>
+					<option value="$curQuality" #if $curQuality in $anyQualities then $selected else ''#>$Quality.get_quality_ui($curQuality)</option>
 #end for
 				</select>
 			</div>
 			<div class="manageCustom pull-left">
 				<h4 style="font-size:14px">Upgrade to</h4>
-#set $bestQualityList = filter_list(lambda x: x > $common.Quality.SDTV, $common.Quality.qualityStrings)
+#set $bestQualityList = filter_list(lambda x: x > $Quality.SDTV, $Quality.qualityStrings)
 				<select id="upgrade-qualities" name="best_qualities" multiple="multiple" size="$len($bestQualityList)">
 #for $curQuality in sorted($bestQualityList):
-					<option value="$curQuality" #if $curQuality in $bestQualities then $selected else ''#>$common.Quality.get_quality_ui($curQuality)</option>
+					<option value="$curQuality" #if $curQuality in $bestQualities then $selected else ''#>$Quality.get_quality_ui($curQuality)</option>
 #end for
 				</select>
 			</div><br />

sickgear.py

@@ -39,7 +39,7 @@ warnings.filterwarnings('ignore', module=r'.*fuzzywuzzy.*')
 warnings.filterwarnings('ignore', module=r'.*ssl_.*', message='.*SSLContext object.*')
 warnings.filterwarnings('ignore', module=r'.*zoneinfo.*', message='.*file or directory.*')
 
-versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 6))]  # inclusive version ranges
+versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 6)), ((3, 9, 0), (3, 9, 0))]  # inclusive version ranges
 if not any(list(map(lambda v: v[0] <= sys.version_info[:3] <= v[1], versions))) and not int(os.environ.get('PYT', 0)):
     print('Python %s.%s.%s detected.' % sys.version_info[:3])
     print('Sorry, SickGear requires a Python version %s' % ', '.join(map(