mirror of
https://github.com/evilhero/mylar
synced 2025-03-09 21:33:42 +00:00
FIX: If newznab provider and nzbget are used, retrieve nzb link broken, FIX:(#645) Experimental search improvements by series length comparisons, FIX:(#645) Experimental searching will now perform normal searching regiment instead of just one, FIX: Fixed incorrect URL for Series on Reading List page, FIX:(#642) Corrected typo in nzbn and moved post-processor extra scripts code so it runs in manual process (big thnx Decipher), FIX: Newer version message when ahead of current comment (again, thnx Decipher)
This commit is contained in:
evilhero
parent
050cafa4d8
commit
1be1a4a9b2
6 changed files with 32 additions and 31 deletions
|
|
@ -35,7 +35,7 @@
|
|||
You're running an unknown version of Mylar. <a href="update">Update</a> or
|
||||
<a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
|
||||
</div>
|
||||
% elif mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win':
|
||||
% elif mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win' and mylar.COMMITS_BEHIND > 0:
|
||||
<div id="updatebar">
|
||||
A <a href="http://github.com/evilhero/mylar/compare/${mylar.CURRENT_VERSION}...${mylar.LATEST_VERSION}"> newer version</a> is available. You're ${mylar.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
<tbody>
|
||||
%for issue in issuelist:
|
||||
<tr>
|
||||
<td id="comicname"><a href="artistPage?ComicID=${issue['ComicID']}">${issue['ComicName']} (${issue['SeriesYear']})</td>
|
||||
<td id="comicname"><a href="comicDetails?ComicID=${issue['ComicID']}">${issue['ComicName']} (${issue['SeriesYear']})</td>
|
||||
<td id="issue">${issue['Issue_Number']}</td>
|
||||
<td id="issueyear">${issue['IssueDate']}</td>
|
||||
<td id="status">${issue['Status']}</td>
|
||||
|
|
|
|||
|
|
@ -822,8 +822,30 @@ class PostProcessor(object):
|
|||
updater.forceRescan(comicid)
|
||||
logger.info(u"Post-Processing completed for: " + series + " issue: " + str(issuenumOG) )
|
||||
self._log(u"Post Processing SUCCESSFULL! ", logger.DEBUG)
|
||||
|
||||
# retrieve/create the corresponding comic objects
|
||||
if mylar.ENABLE_EXTRA_SCRIPTS:
|
||||
folderp = str(dst) #folder location after move/rename
|
||||
nzbn = self.nzb_name #original nzb name
|
||||
filen = str(nfilename + ext) #new filename
|
||||
#name, comicyear, comicid , issueid, issueyear, issue, publisher
|
||||
#create the dic and send it.
|
||||
seriesmeta = []
|
||||
seriesmetadata = {}
|
||||
seriesmeta.append({
|
||||
'name': series,
|
||||
'comicyear': seriesyear,
|
||||
'comicid': comicid,
|
||||
'issueid': issueid,
|
||||
'issueyear': issueyear,
|
||||
'issue': issuenum,
|
||||
'publisher': publisher
|
||||
})
|
||||
seriesmetadata['seriesmeta'] = seriesmeta
|
||||
self._run_extra_scripts(nzbn, self.nzb_folder, filen, folderp, seriesmetadata )
|
||||
|
||||
if ml is not None:
|
||||
return
|
||||
return self.log
|
||||
else:
|
||||
if mylar.PROWL_ENABLED:
|
||||
pushmessage = series + '(' + issueyear + ') - issue #' + issuenumOG
|
||||
|
|
@ -846,27 +868,5 @@ class PostProcessor(object):
|
|||
boxcar.notify(series, str(issueyear), str(issuenumOG))
|
||||
|
||||
|
||||
# retrieve/create the corresponding comic objects
|
||||
|
||||
if mylar.ENABLE_EXTRA_SCRIPTS:
|
||||
folderp = str(dst) #folder location after move/rename
|
||||
nzbn = self.nzb_name #original nzb name
|
||||
filen = str(nfilename + ext) #new filename
|
||||
#name, comicyear, comicid , issueid, issueyear, issue, publisher
|
||||
#create the dic and send it.
|
||||
seriesmeta = []
|
||||
seriesmetadata = {}
|
||||
seriesmeta.append({
|
||||
'name': series,
|
||||
'comicyear': seriesyear,
|
||||
'comicid': comicid,
|
||||
'issueid': issueid,
|
||||
'issueyear': issueyear,
|
||||
'issue': issuenum,
|
||||
'publisher': publisher
|
||||
})
|
||||
seriesmetadata['seriesmeta'] = seriesmeta
|
||||
self._run_extra_scripts(nzbname, self.nzb_folder, filen, folderp, seriesmetadata )
|
||||
|
||||
return self.log
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ def Startit(searchName, searchIssue, searchYear, ComicVersion, IssDateFix):
|
|||
#searchName = "Uncanny Avengers"
|
||||
#searchIssue = "01"
|
||||
#searchYear = "2012"
|
||||
cName = searchName
|
||||
#clean up searchName due to webparse.
|
||||
searchName = searchName.replace("%20", " ")
|
||||
if "," in searchName:
|
||||
|
|
@ -104,7 +105,7 @@ def Startit(searchName, searchIssue, searchYear, ComicVersion, IssDateFix):
|
|||
for subs in splitTitle:
|
||||
#logger.fdebug('sub:' + subs)
|
||||
regExCount = 0
|
||||
if len(subs) > 10 and not any(d in subs.lower() for d in except_list):
|
||||
if len(subs) >= len(cName) and not any(d in subs.lower() for d in except_list):
|
||||
#Looping through dictionary to run each regEx - length + regex is determined by regexList up top.
|
||||
# while regExCount < len(regexList):
|
||||
# regExTest = re.findall(regexList[regExCount], subs, flags=re.IGNORECASE)
|
||||
|
|
@ -145,8 +146,6 @@ def Startit(searchName, searchIssue, searchYear, ComicVersion, IssDateFix):
|
|||
if tallycount >= 1:
|
||||
mres['entries'] = entries
|
||||
return mres
|
||||
# print("Title: "+regList[0])
|
||||
# print("Link: "+keyPair[regList[0]])
|
||||
else:
|
||||
logger.fdebug("No Results Found")
|
||||
return "no results"
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ def findComic(name, mode, issue, limityear=None):
|
|||
'description': xmldesc
|
||||
})
|
||||
else:
|
||||
print ("year: " + str(xmlYr) + " - contraint not met. Has to be within " + str(limityear))
|
||||
logger.fdebug('year: ' + str(xmlYr) + ' - contraint not met. Has to be within ' + str(limityear))
|
||||
n+=1
|
||||
#search results are limited to 100 and by pagination now...let's account for this.
|
||||
countResults = countResults + 100
|
||||
|
|
|
|||
|
|
@ -666,7 +666,7 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
|
|||
#bb = parseit.MysterBinScrape(comsearch[findloop], comyear)
|
||||
bb = findcomicfeed.Startit(u_ComicName, isssearch, comyear, ComicVersion, IssDateFix)
|
||||
# since the regexs in findcomicfeed do the 3 loops, lets force the exit after
|
||||
cmloopit == 1
|
||||
#cmloopit == 1
|
||||
|
||||
done = False
|
||||
foundc = "no"
|
||||
|
|
@ -1238,7 +1238,9 @@ def NZB_SEARCH(ComicName, IssueNumber, ComicYear, SeriesYear, Publisher, IssueDa
|
|||
#following is JUST for nzb.su
|
||||
if nzbprov == 'nzb.su' or nzbprov == 'newznab':
|
||||
linkit = os.path.splitext(entry['link'])[1]
|
||||
linkit = linkit.replace("&", "%26")
|
||||
if mylar.USE_SABNZBD:
|
||||
linkit = linkit.replace("&", "%26")
|
||||
logger.fdebug('new linkit:' + linkit)
|
||||
linkapi = str(linkstart) + str(linkit)
|
||||
else:
|
||||
# this should work for every other provider
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue