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

IMP: Alternate Search Names now working for filechecking, IMP: Issue Status weren't being updated properly, only Issues that were FOUND had the Status changed...now will update all Issue Status for a series upon a refresh/recheck files.

This commit is contained in:
evilhero 2013-08-05 23:20:09 -04:00
parent e4e1bcc078
commit a7fd194099
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mylar/filechecker.py
View File

@ -175,8 +175,8 @@ def listFiles(dir,watchcomic,AlternateSearch=None):
AS_Alternate = re.sub('##','',calt)
#same = encode.
u_altsearchcomic = AS_Alternate.encode('ascii', 'ignore').strip()
altsearchcomic = re.sub('[\_\#\,\/\:\;\.\-\!\$\%\+\'\?\@]', ' ', u_altsearchcomic)
altseachcomic = re.sub('\&', ' and ', altsearchcomic)
altsearchcomic = re.sub('[\_\#\,\/\:\;\.\-\!\$\%\+\'\?\@]', '', u_altsearchcomic)
altsearchcomic = re.sub('\&', ' and ', altsearchcomic)
altsearchcomic = re.sub('\s+', ' ', str(altsearchcomic)).strip()
AS_Alt.append(altsearchcomic)
else:
@ -186,7 +186,7 @@ def listFiles(dir,watchcomic,AlternateSearch=None):
#if '_' in subname:
# subname = subname.replace('_', ' ')
logger.fdebug("watchcomic:" + str(modwatchcomic) + " ..comparing to found file: " + str(subname))
if modwatchcomic.lower() in subname.lower() or any(x in subname.lower() for x in AS_Alt):#altsearchcomic.lower() in subname.lower():
if modwatchcomic.lower() in subname.lower() or any(x.lower() in subname.lower() for x in AS_Alt):#altsearchcomic.lower() in subname.lower():
comicpath = os.path.join(basedir, item)
logger.fdebug( modwatchcomic + " - watchlist match on : " + comicpath)
comicsize = os.path.getsize(comicpath)
@ -202,7 +202,7 @@ def listFiles(dir,watchcomic,AlternateSearch=None):
if modwatchcomic.lower() in subname.lower():
cchk = modwatchcomic
else:
cchk_ls = [x for x in AS_Alt if x in subname.lower()]
cchk_ls = [x for x in AS_Alt if x.lower() in subname.lower()]
cchk = cchk_ls[0]
#print "something: " + str(cchk)

21
mylar/updater.py
View File

@ -20,6 +20,7 @@ import urllib2
import shlex
import re
import os
import itertools
import mylar
from mylar import db, logger, helpers, filechecker
@ -399,7 +400,7 @@ def forceRescan(ComicID,archive=None):
issueexceptdupechk = []
reissues = myDB.action('SELECT * FROM issues WHERE ComicID=?', [ComicID]).fetchall()
issID_to_ignore = []
issID_to_ignore.append(str(ComicID))
while (fn < fccnt):
haveissue = "no"
issuedupe = "no"
@ -514,8 +515,8 @@ def forceRescan(ComicID,archive=None):
fcdigit = helpers.issuedigits(fcnew[som])
logger.fdebug("fcdigit: " + str(fcdigit))
logger.fdebug("int_iss: " + str(int_iss))
#logger.fdebug("fcdigit: " + str(fcdigit))
#logger.fdebug("int_iss: " + str(int_iss))
if int(fcdigit) == int_iss:
logger.fdebug("issue match - fcdigit: " + str(fcdigit) + " ... int_iss: " + str(int_iss))
@ -660,7 +661,8 @@ def forceRescan(ComicID,archive=None):
"ComicSize": issSize,
"Status": issStatus
}
issID_to_ignore.append(iss_id)
issID_to_ignore.append(str(iss_id))
if 'annual' in temploc.lower():
myDB.upsert("annuals", newValueDict, controlValueDict)
@ -669,13 +671,12 @@ def forceRescan(ComicID,archive=None):
fn+=1
logger.fdebug("IssueID's to ignore: " + str(issID_to_ignore))
#here we need to change the status of the ones we DIDN'T FIND above since the loop only hits on FOUND issues.
update_iss = []
tmpsql = "SELECT * FROM issues WHERE ComicID=? AND IssueID not in ({seq})".format(seq=','.join(['?']*len(issID_to_ignore)))
args = [ComicID, issID_to_ignore]
# chkthis = myDB.action(tmpsql, args).fetchall()
chkthis = None
tmpsql = "SELECT * FROM issues WHERE ComicID=? AND IssueID not in ({seq})".format(seq=','.join(['?']*(len(issID_to_ignore)-1)))
chkthis = myDB.action(tmpsql, issID_to_ignore).fetchall()
# chkthis = None
if chkthis is None:
pass
else:
@ -713,7 +714,7 @@ def forceRescan(ComicID,archive=None):
newStatusValue = {"Status": ui['Status']}
myDB.upsert("issues", newStatusValue, controlValueDict)
i+=1
logger.info("updated " + str(i) + " issues that weren't found.")
logger.info("Updated the status of " + str(i) + " issues for " + rescan['ComicName'] + " (" + str(rescan['ComicYear']) + ") that weren't found.")
logger.info("Total files located: " + str(havefiles))
foundcount = havefiles