monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 10:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Licensed User 2017-05-17 23:00:59 +01:00
commit 72fb57fa57
4 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -61,6 +61,11 @@
* Remove AlphaReign torrent provider * Remove AlphaReign torrent provider
### 0.12.18 (2017-05-15 23:00:00 UTC)
* Change thexem, remove tvrage from xem
### 0.12.17 (2017-05-15 22:10:00 UTC) ### 0.12.17 (2017-05-15 22:10:00 UTC)
* Remove provider ExtraTorrent * Remove provider ExtraTorrent

2
sickbeard/indexers/indexer_config.py
View file

@ -103,8 +103,6 @@ indexerConfig[info_src].update(dict(
'showinfo.php?key=%(apikey)s&sid=' % indexerConfig[info_src]['api_params']), 'showinfo.php?key=%(apikey)s&sid=' % indexerConfig[info_src]['api_params']),
show_url='%sshows/id-' % indexerConfig[info_src]['main_url'], show_url='%sshows/id-' % indexerConfig[info_src]['main_url'],
scene_url='https://sickgear.github.io/sg_tvrage_scene_exceptions/exceptions.txt', scene_url='https://sickgear.github.io/sg_tvrage_scene_exceptions/exceptions.txt',
# thexem tvrage mappings are deprecated, disable data fetch
# xem_origin='rage',
defunct=True, defunct=True,
)) ))

2
sickbeard/scene_exceptions.py
View file

@ -289,7 +289,7 @@ def _xem_exceptions_fetcher():
break break
if shouldRefresh(xem_list): if shouldRefresh(xem_list):
for indexer in sickbeard.indexerApi().indexers: for indexer in [i for i in sickbeard.indexerApi().indexers if 'xem_origin' in sickbeard.indexerApi(i).config]:
logger.log(u'Checking for XEM scene exception updates for %s' % sickbeard.indexerApi(indexer).name) logger.log(u'Checking for XEM scene exception updates for %s' % sickbeard.indexerApi(indexer).name)
url = 'http://thexem.de/map/allNames?origin=%s%s&seasonNumbers=1'\ url = 'http://thexem.de/map/allNames?origin=%s%s&seasonNumbers=1'\

2
sickbeard/scene_numbering.py
View file

@ -461,7 +461,7 @@ def xem_refresh(indexer_id, indexer, force=False):
indexer_id = int(indexer_id) indexer_id = int(indexer_id)
indexer = int(indexer) indexer = int(indexer)
if indexer_id not in xem_ids_list[indexer]: if 'xem_origin' not in sickbeard.indexerApi(indexer).config or indexer_id not in xem_ids_list.get(indexer, []):
return return
# XEM API URL # XEM API URL