Browse Source

Merge branch 'master' into develop

tags/release_0.25.1
JackDandy 5 years ago
parent
commit
41f13ebcff
  1. 7
      CHANGES.md
  2. 12
      gui/slick/interfaces/default/inc_top.tmpl
  3. 3
      sickgear.py

7
CHANGES.md

@ -16,6 +16,13 @@
* Change don't remember folder used during auto processing
### 0.23.2 (2020-11-21 18:40:00 UTC)
* Change allow Python 3.8.7
* Change suppress py27 startup cryptography deprecation warning
* Fix filter out history items that don't qualify for status snatched/good
### 0.23.1 (2020-11-16 23:00:00 UTC)
* Fix image failure for a show that is force updated, removed, then readded

12
gui/slick/interfaces/default/inc_top.tmpl

@ -203,22 +203,28 @@
#end if
</ul>
<ul class="nav add-tab3 default-off">
#if not $history_compact:
<li><span style="padding-left:20px">This will list latest history</span></li>
#else
#set $history_count = 0
#if $history_compact:
#for item in $history_compact
#if 'tvid_prodid' in $item
#set $action = $item['actions'][0]
#set $curStatus, $curQuality = $Quality.splitCompositeStatus(int($action['action']))
#set $status = None
#if $curStatus in $SNATCHED_ANY + [$FAILED]
#set $status = 'snatched'
#elif $curStatus in [$DOWNLOADED, $ARCHIVED]
#set $status = 'good'
#end if
#if None is not $status
#set $history_count += 1
<li><a href="$sbRoot/home/view-show?tvid_prodid=$item['tvid_prodid']" tabindex="$tab#set $tab += 1#"><span class="$status"><i class="sgicon-addshow"></i></span><span class="truncate">$item['show_name']</span></a></li>
#end if
#end if
#end for
#end if
#if not $history_compact or not $history_count:
<li><span style="padding-left:20px">This will list latest history</span></li>
#end if
</ul>
</li>
</ul>

3
sickgear.py

@ -38,8 +38,9 @@ warnings.filterwarnings('ignore', module=r'.*connectionpool.*', message='.*certi
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.*')
warnings.filterwarnings('ignore', message='.*deprecated in cryptography.*')
versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 6)), ((3, 9, 0), (3, 9, 0))] # inclusive version ranges
versions = [((2, 7, 9), (2, 7, 18)), ((3, 7, 1), (3, 8, 7)), ((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(

Loading…
Cancel
Save