dockeruser
/
SickGear
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fix for air-by-date and sports shows

tags/release_0.1.0
echel0n 11 years ago
parent
fb0339a274
commit
35f70c7924
11 changed files with 36 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      gui/slick/interfaces/default/config_general.tmpl
  2. 7
      sickbeard/providers/hdtorrents.py
  3. 7
      sickbeard/providers/iptorrents.py
  4. 6
      sickbeard/providers/kat.py
  5. 7
      sickbeard/providers/nextgen.py
  6. 4
      sickbeard/providers/publichd.py
  7. 7
      sickbeard/providers/scc.py
  8. 6
      sickbeard/providers/speedcd.py
  9. 4
      sickbeard/providers/thepiratebay.py
  10. 7
      sickbeard/providers/torrentday.py
  11. 6
      sickbeard/providers/torrentleech.py

13
gui/slick/interfaces/default/config_general.tmpl
View File

@ -83,17 +83,6 @@
</div> </div>
<div class="field-pair"> <div class="field-pair">
<label class="nocheck clearfix">
<span class="component-title">Update Frequency</span>
<input type="text" name="update_frequency" id="update_frequency" value="$sickbeard.UPDATE_FREQUENCY" size="5" />
</label>
<label class="nocheck clearfix">
<span class="component-title">&nbsp;</span>
<span class="component-desc">Time in hours to check for software updates (eg. 12)</span>
</label>
</div>
<div class="field-pair">
<input type="checkbox" name="auto_update" id="auto_update" #if $sickbeard.AUTO_UPDATE then "checked=\"checked\"" else ""#/> <input type="checkbox" name="auto_update" id="auto_update" #if $sickbeard.AUTO_UPDATE then "checked=\"checked\"" else ""#/>
<label class="clearfix" for="auto_update"> <label class="clearfix" for="auto_update">
<span class="component-title">Automatic Updates</span> <span class="component-title">Automatic Updates</span>
@ -101,7 +90,7 @@
</label> </label>
<label class="nocheck clearfix"> <label class="nocheck clearfix">
<span class="component-title">&nbsp;</span> <span class="component-title">&nbsp;</span>
<span class="component-desc">Automatic Updates run on startup and in the background every 12 hours.</span> <span class="component-desc">Automatic Updates run on startup and in the background on the interval specified above.</span>
</label> </label>
</div> </div>

7
sickbeard/providers/hdtorrents.py
View File

@ -37,6 +37,7 @@ from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from lib.unidecode import unidecode from lib.unidecode import unidecode
from sickbeard.helpers import sanitizeSceneName
class HDTorrentsProvider(generic.TorrentProvider): class HDTorrentsProvider(generic.TorrentProvider):
@ -132,9 +133,9 @@ class HDTorrentsProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

7
sickbeard/providers/iptorrents.py
View File

@ -36,6 +36,7 @@ from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from lib.unidecode import unidecode from lib.unidecode import unidecode
from sickbeard.helpers import sanitizeSceneName
class IPTorrentsProvider(generic.TorrentProvider): class IPTorrentsProvider(generic.TorrentProvider):
@ -114,9 +115,9 @@ class IPTorrentsProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

6
sickbeard/providers/kat.py
View File

@ -193,10 +193,10 @@ class KATProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \
helpers.custom_strftime('%Y %b {S}', episode)
ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode).replace('-','|') + '|' + \
helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):

7
sickbeard/providers/nextgen.py
View File

@ -38,6 +38,7 @@ from sickbeard import clients
from lib import requests from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from sickbeard.helpers import sanitizeSceneName
class NextGenProvider(generic.TorrentProvider): class NextGenProvider(generic.TorrentProvider):
@ -152,9 +153,9 @@ class NextGenProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

4
sickbeard/providers/publichd.py
View File

@ -101,8 +101,8 @@ class PublicHDProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):

7
sickbeard/providers/scc.py
View File

@ -37,6 +37,7 @@ from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from lib.unidecode import unidecode from lib.unidecode import unidecode
from sickbeard.helpers import sanitizeSceneName
class SCCProvider(generic.TorrentProvider): class SCCProvider(generic.TorrentProvider):
@ -123,9 +124,9 @@ class SCCProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

6
sickbeard/providers/speedcd.py
View File

@ -34,6 +34,8 @@ from sickbeard.exceptions import ex
from sickbeard import clients from sickbeard import clients
from lib import requests from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from sickbeard.helpers import sanitizeSceneName
class SpeedCDProvider(generic.TorrentProvider): class SpeedCDProvider(generic.TorrentProvider):
@ -118,7 +120,9 @@ class SpeedCDProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) +' '+ str(episode) ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

4
sickbeard/providers/thepiratebay.py
View File

@ -203,8 +203,8 @@ class ThePirateBayProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):
ep_string = sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(allPossibleShowNames(show)): for show_name in set(allPossibleShowNames(show)):

7
sickbeard/providers/torrentday.py
View File

@ -36,6 +36,7 @@ from lib import requests
from lib.requests import exceptions from lib.requests import exceptions
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
from lib.unidecode import unidecode from lib.unidecode import unidecode
from sickbeard.helpers import sanitizeSceneName
class TorrentDayProvider(generic.TorrentProvider): class TorrentDayProvider(generic.TorrentProvider):
@ -136,9 +137,9 @@ class TorrentDayProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

6
sickbeard/providers/torrentleech.py
View File

@ -118,9 +118,9 @@ class TorrentLeechProvider(generic.TorrentProvider):
if abd: if abd:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):
ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ ep_string = sanitizeSceneName(show_name) + ' ' + \
str(episode) + '|' + \ str(episode).replace('-', '|') + '|' + \
helpers.custom_strftime('%Y %b {S}', episode) helpers.custom_strftime('%b', episode)
search_string['Episode'].append(ep_string) search_string['Episode'].append(ep_string)
else: else:
for show_name in set(show_name_helpers.allPossibleShowNames(show)): for show_name in set(show_name_helpers.allPossibleShowNames(show)):

Write Preview
Loading…
Cancel
Save