mirror
/
mylar
mirror of https://github.com/evilhero/mylar
1
0
Fork 0
Code Issues Releases Wiki Activity

IMP: added necessary abbreviations

This commit is contained in:
evilhero 2013-10-01 13:41:33 -04:00
parent 85db439550
commit 732d93e109
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -58,4 +58,3 @@ The Config screen ...
![preview thumb](http://i.imgur.com/nQjIN.png) ![preview thumb](http://i.imgur.com/nQjIN.png)
reddit nick is evil-hero

2
data/interfaces/default/config.html
View File

@ -423,7 +423,7 @@
<input id="enable_kat" type="checkbox" name="enable_kat" value=1 ${config['enable_kat']} /><label>Enable KAT</label> <input id="enable_kat" type="checkbox" name="enable_kat" value=1 ${config['enable_kat']} /><label>Enable KAT</label>
</div> </div>
<div class="row checkbox left clearfix"> <div class="row checkbox left clearfix">
<input id="enable_cbt" type="checkbox" onclick="initConfigCheckbox($(this));" name="enable_cbt" value=1 ${config['enable_cbt']} /><label>Enable ComicBT</label> <input id="enable_cbt" type="checkbox" onclick="initConfigCheckbox($(this));" name="enable_cbt" value=1 ${config['enable_cbt']} /><label>Enable CBT</label>
</div> </div>
<div class="config"> <div class="config">
<label>&nbspPasskey</label> <label>&nbspPasskey</label>

21
mylar/search.py
View File

@ -132,8 +132,7 @@ def search_init(ComicName, IssueNumber, ComicYear, SeriesYear, IssueDate, IssueI
while (torpr >=0 ): while (torpr >=0 ):
if torprovider[torpr] == 'cbt': if torprovider[torpr] == 'cbt':
# ComicBT torprov = 'CBT'
torprov = 'ComicBT'
elif torprovider[torpr] == 'kat': elif torprovider[torpr] == 'kat':
torprov = 'KAT' torprov = 'KAT'
@ -476,8 +475,8 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
logger.fdebug('RSS Check: ' + str(RSS)) logger.fdebug('RSS Check: ' + str(RSS))
logger.fdebug('nzbprov: ' + str(nzbprov)) logger.fdebug('nzbprov: ' + str(nzbprov))
logger.fdebug('comicid: ' + str(ComicID)) logger.fdebug('comicid: ' + str(ComicID))
if RSS == "yes" or nzbprov == 'ComicBT': if RSS == "yes" or nzbprov == 'CBT':
if nzbprov == 'ComicBT' or nzbprov == 'KAT': if nzbprov == 'CBT' or nzbprov == 'KAT':
cmname = re.sub("%20", " ", str(comsrc)) cmname = re.sub("%20", " ", str(comsrc))
logger.fdebug("Sending request to [" + str(nzbprov) + "] RSS for " + str(findcomic) + " : " + str(mod_isssearch)) logger.fdebug("Sending request to [" + str(nzbprov) + "] RSS for " + str(findcomic) + " : " + str(mod_isssearch))
bb = rsscheck.torrentdbsearch(findcomic,mod_isssearch,ComicID,nzbprov) bb = rsscheck.torrentdbsearch(findcomic,mod_isssearch,ComicID,nzbprov)
@ -493,9 +492,9 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
else: else:
#CBT is redudant now since only RSS works #CBT is redudant now since only RSS works
# - just getting it ready for when it's not redudant :) # - just getting it ready for when it's not redudant :)
if nzbprov == 'ComicBT': if nzbprov == 'CBT':
# cmname = re.sub("%20", " ", str(comsrc)) # cmname = re.sub("%20", " ", str(comsrc))
# logger.fdebug("Sending request to [ComicBT] RSS for " + str(cmname) + " : " + str(mod_isssearch)) # logger.fdebug("Sending request to [CBT] RSS for " + str(cmname) + " : " + str(mod_isssearch))
# bb = rsscheck.torrentdbsearch(cmname,mod_isssearch,ComicID) # bb = rsscheck.torrentdbsearch(cmname,mod_isssearch,ComicID)
# rss = "yes" # rss = "yes"
# if bb is not None: logger.fdebug("results: " + str(bb)) # if bb is not None: logger.fdebug("results: " + str(bb))
@ -578,12 +577,12 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
else: else:
for entry in bb['entries']: for entry in bb['entries']:
logger.fdebug("checking search result: " + entry['title']) logger.fdebug("checking search result: " + entry['title'])
if nzbprov != "experimental" and nzbprov != "ComicBT": if nzbprov != "experimental" and nzbprov != "CBT":
if RSS == "yes": if RSS == "yes":
comsize_b = entry['length'] comsize_b = entry['length']
else: else:
#Experimental already has size constraints done. #Experimental already has size constraints done.
if nzbprov == 'ComicBT': if nzbprov == 'CBT':
comsize_b = 0 #CBT rss doesn't have sizes comsize_b = 0 #CBT rss doesn't have sizes
elif nzbprov == 'KAT': elif nzbprov == 'KAT':
comsize_b = entry['length'] comsize_b = entry['length']
@ -623,7 +622,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
nzbname = cleantitle nzbname = cleantitle
# if it's coming from CBT, remove the ' -' at the end as it screws it up. # if it's coming from CBT, remove the ' -' at the end as it screws it up.
if nzbprov == 'ComicBT': if nzbprov == 'CBT':
if cleantitle.endswith(' - '): if cleantitle.endswith(' - '):
cleantitle = cleantitle[:-3] cleantitle = cleantitle[:-3]
logger.fdebug("cleaned up title to : " + str(cleantitle)) logger.fdebug("cleaned up title to : " + str(cleantitle))
@ -1015,7 +1014,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
#blackhole functinality--- #blackhole functinality---
#let's download the file to a temporary cache. #let's download the file to a temporary cache.
sent_to = None sent_to = None
if mylar.BLACKHOLE and nzbprov != 'ComicBT' and nzbprov != 'KAT': if mylar.BLACKHOLE and nzbprov != 'CBT' and nzbprov != 'KAT':
logger.fdebug("using blackhole directory at : " + str(mylar.BLACKHOLE_DIR)) logger.fdebug("using blackhole directory at : " + str(mylar.BLACKHOLE_DIR))
if os.path.exists(mylar.BLACKHOLE_DIR): if os.path.exists(mylar.BLACKHOLE_DIR):
#pretty this biatch up. #pretty this biatch up.
@ -1041,7 +1040,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, nzbprov, nzbpr, Is
logger.fdebug("nzb name to be used for post-processing is : " + str(nzbname)) logger.fdebug("nzb name to be used for post-processing is : " + str(nzbname))
sent_to = "your Blackhole Directory" sent_to = "your Blackhole Directory"
#end blackhole #end blackhole
elif nzbprov == 'ComicBT' or nzbprov == 'KAT': elif nzbprov == 'CBT' or nzbprov == 'KAT':
logger.fdebug("sending .torrent to watchdir.") logger.fdebug("sending .torrent to watchdir.")
logger.fdebug("ComicName:" + ComicName) logger.fdebug("ComicName:" + ComicName)
logger.fdebug("link:" + entry['link']) logger.fdebug("link:" + entry['link'])