monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-03-15 09:07:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #74 from JackDandy/FixAirDateAt12

Browse source 
Fix exception raised when converting 12pm to 24hr format, also handles 1...
This commit is contained in:
JackDandy 2014-10-31 16:52:07 +00:00
commit acc09148f1
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -31,6 +31,7 @@
* Combined delete and remove buttons in to one on individual show pages * Combined delete and remove buttons in to one on individual show pages
* Other small UI tweaks * Other small UI tweaks
* Fix keyerrors on backlog overview preventing the page to load * Fix keyerrors on backlog overview preventing the page to load
* Fix exception raised when converting 12pm to 24hr format and handle 12am when setting file modify time (e.g. used during PP)
[develop changelog] [develop changelog]
* Improve display of progress bars in the Downloads columns of the show list page * Improve display of progress bars in the Downloads columns of the show list page

1
sickbeard/tv.py
View file

@ -2470,6 +2470,7 @@ class TVEpisode(object):
if airs: if airs:
hr = int(airs.group(1)) hr = int(airs.group(1))
hr = (12 + hr, hr)[None is airs.group(3)] hr = (12 + hr, hr)[None is airs.group(3)]
hr = (hr, hr - 12)[0 == hr % 12]
min = int((airs.group(2), min)[None is airs.group(2)]) min = int((airs.group(2), min)[None is airs.group(2)])
airtime = datetime.time(hr, min) airtime = datetime.time(hr, min)