mirror of
https://github.com/evilhero/mylar
synced 2024-12-25 09:11:46 +00:00
FIX:(#1241) Failure to post-process items within sub-directories
This commit is contained in:
evilhero
parent
fef65da981
commit
de93fb8a70
2 changed files with 49 additions and 51 deletions
|
|
@ -198,7 +198,7 @@ class PostProcessor(object):
|
|||
logger.fdebug(module + ' Not using SABnzbd : Manual Run')
|
||||
else:
|
||||
# if the SAB Directory option is enabled, let's use that folder name and append the jobname.
|
||||
if mylar.SAB_DIRECTORY is not None and mylar.SAB_DIRECTORY is not 'None' and len(mylar.SAB_DIRECTORY) > 4:
|
||||
if all([mylar.SAB_TO_MYLAR, mylar.SAB_DIRECTORY is not None, mylar.SAB_DIRECTORY != 'None', len(mylar.SAB_DIRECTORY) > 4]):
|
||||
self.nzb_folder = os.path.join(mylar.SAB_DIRECTORY, self.nzb_name).encode(mylar.SYS_ENCODING)
|
||||
logger.fdebug(module + ' SABnzbd Download folder option enabled. Directory set to : ' + self.nzb_folder)
|
||||
|
||||
|
|
@ -249,7 +249,6 @@ class PostProcessor(object):
|
|||
if filelist['comiccount'] == 0: # is None:
|
||||
logger.warn('There were no files located - check the debugging logs if you think this is in error.')
|
||||
return
|
||||
logger.info(filelist)
|
||||
logger.info('I have located ' + str(filelist['comiccount']) + ' files that I should be able to post-process. Continuing...')
|
||||
|
||||
#preload the entire ALT list in here.
|
||||
|
|
@ -268,7 +267,6 @@ class PostProcessor(object):
|
|||
as_d = filechecker.FileChecker(watchcomic=fl['series_name'].decode('utf-8'))
|
||||
as_dinfo = as_d.dynamic_replace(fl['series_name'])
|
||||
mod_seriesname = as_dinfo['mod_seriesname']
|
||||
logger.fdebug('Dynamic-ComicName: ' + mod_seriesname)
|
||||
loopchk = []
|
||||
for x in alt_list:
|
||||
if mod_seriesname in x['AS_Alt']:
|
||||
|
|
@ -420,7 +418,11 @@ class PostProcessor(object):
|
|||
logger.info(module + ' Found matching issue # ' + str(fcdigit) + ' for ComicID: ' + str(cs['ComicID']) + ' / IssueID: ' + str(issuechk['IssueID']))
|
||||
|
||||
if datematch == "True":
|
||||
manual_list.append({"ComicLocation": os.path.join(watchmatch['comiclocation'],watchmatch['comicfilename'].decode('utf-8')),
|
||||
if watchmatch['sub']:
|
||||
clocation = os.path.join(watchmatch['comiclocation'], watchmatch['sub'], watchmatch['comicfilename'].decode('utf-8'))
|
||||
else:
|
||||
clocation = os.path.join(watchmatch['comiclocation'],watchmatch['comicfilename'].decode('utf-8'))
|
||||
manual_list.append({"ComicLocation": clocation,
|
||||
"ComicID": cs['ComicID'],
|
||||
"IssueID": issuechk['IssueID'],
|
||||
"IssueNumber": issuechk['Issue_Number'],
|
||||
|
|
@ -569,8 +571,12 @@ class PostProcessor(object):
|
|||
break
|
||||
passit = True
|
||||
if passit == False:
|
||||
if arcmatch['sub']:
|
||||
clocation = os.path.join(arcmatch['comiclocation'], arcmatch['sub'], arcmatch['comicfilename'].decode('utf-8'))
|
||||
else:
|
||||
clocation = os.path.join(arcmatch['comiclocation'], arcmatch['comicfilename'].decode('utf-8'))
|
||||
logger.info('[' + k + ' #' + str(issuechk['IssueNumber']) + '] MATCH: ' + tmpfc['ComicLocation'] + ' / ' + str(issuechk['IssueID']) + ' / ' + str(v[i]['ArcValues']['IssueID']))
|
||||
manual_arclist.append({"ComicLocation": arcmatch['comiclocation'],
|
||||
manual_arclist.append({"ComicLocation": clocation,
|
||||
"ComicID": v[i]['WatchValues']['ComicID'],
|
||||
"IssueID": v[i]['ArcValues']['IssueID'],
|
||||
"IssueNumber": v[i]['ArcValues']['IssueNumber'],
|
||||
|
|
|
|||
|
|
@ -109,8 +109,7 @@ class FileChecker(object):
|
|||
|
||||
if self.file:
|
||||
runresults = self.parseit(self.dir, self.file)
|
||||
if runresults['parse_status'] == 'success':
|
||||
return {'parse_status': 'success',
|
||||
return {'parse_status': runresults['parse_status'],
|
||||
'sub': runresults['sub'],
|
||||
'comicfilename': runresults['comicfilename'],
|
||||
'comiclocation': runresults['comiclocation'],
|
||||
|
|
@ -120,16 +119,6 @@ class FileChecker(object):
|
|||
'issue_number': runresults['issue_number'],
|
||||
'scangroup': runresults['scangroup']
|
||||
}
|
||||
else:
|
||||
return {'parse_status': 'failure',
|
||||
'comicfilename': runresults['comicfilename'],
|
||||
'comiclocation': runresults['comiclocation'],
|
||||
'series_name': runresults['series_name'],
|
||||
'series_volume': runresults['series_volume'],
|
||||
'issue_year': runresults['issue_year'],
|
||||
'issue_number': runresults['issue_number'],
|
||||
'scangroup': runresults['scangroup']
|
||||
}
|
||||
else:
|
||||
filelist = self.traverse_directories(self.dir)
|
||||
|
||||
|
|
@ -164,6 +153,7 @@ class FileChecker(object):
|
|||
})
|
||||
else:
|
||||
comiclist.append({
|
||||
'sub': runresults['sub'],
|
||||
'ComicFilename': runresults['comicfilename'],
|
||||
'ComicLocation': runresults['comiclocation'],
|
||||
'ComicSize': files['comicsize'],
|
||||
|
|
@ -178,6 +168,7 @@ class FileChecker(object):
|
|||
else:
|
||||
#failiure
|
||||
self.failed_files.append({'parse_status': 'failure',
|
||||
'sub': runresults['sub'],
|
||||
'comicfilename': runresults['comicfilename'],
|
||||
'comiclocation': runresults['comiclocation'],
|
||||
'series_name': runresults['series_name'],
|
||||
|
|
@ -200,22 +191,21 @@ class FileChecker(object):
|
|||
|
||||
#filename = filename.encode('ASCII').decode('utf8')
|
||||
path_list = None
|
||||
if self.manual or self.file:
|
||||
if subpath is None:
|
||||
logger.fdebug('[CORRECTION] No sub-path found - file is located in root. Altering path configuration.')
|
||||
subpath = path
|
||||
tmppath = None
|
||||
path_list = None
|
||||
else:
|
||||
logger.fdebug('[CORRECTION] Sub-directory found. Altering path configuration.')
|
||||
#basepath the sub if it exists to get the parent folder.
|
||||
logger.fdebug('Checking Folder Name for more information.')
|
||||
logger.fdebug('[SUB-PATH] Checking Folder Name for more information.')
|
||||
#sub = re.sub(origpath, '', path).strip()})
|
||||
logger.fdebug('Original Path : ' + str(path))
|
||||
logger.fdebug('Sub-Path : ' + str(subpath))
|
||||
logger.fdebug('[SUB-PATH] Original Path : ' + str(path))
|
||||
logger.fdebug('[SUB-PATH] Sub-direcotry : ' + str(subpath))
|
||||
tmppath = re.sub(path, '', subpath).strip()
|
||||
tmppath = os.path.normpath(tmppath)
|
||||
path_list = tmppath.split(os.sep)[-1]
|
||||
logger.fdebug('subpath set to : ' + path_list)
|
||||
logger.fdebug('[SUB-PATH] subpath set to : ' + path_list)
|
||||
|
||||
|
||||
#parse out the extension for type
|
||||
|
|
@ -626,7 +616,7 @@ class FileChecker(object):
|
|||
if highest_series_pos > pis['position']: highest_series_pos = pis['position']
|
||||
break
|
||||
if pis['mod_position'] > finddash and finddash != -1:
|
||||
if finddash < yearposition and finddash > (yearmodposition + len(split_file.index(position))):
|
||||
if finddash < yearposition and finddash > (yearmodposition + len(split_file[yearposition])):
|
||||
logger.fdebug('issue number is positioned after a dash - probably not an issue number, but part of an issue title')
|
||||
dash_numbers.append({'mod_position': pis['mod_position'],
|
||||
'number': pis['number'],
|
||||
|
|
@ -697,10 +687,10 @@ class FileChecker(object):
|
|||
|
||||
#check for annual in title(s) here.
|
||||
|
||||
if path_list is not None:
|
||||
clocation = os.path.join(path_list, filename)
|
||||
else:
|
||||
clocation = self.dir
|
||||
#if path_list is not None:
|
||||
# clocation = os.path.join(path, path_list, filename)
|
||||
#else:
|
||||
# clocation = self.dir
|
||||
|
||||
#if issue_number is None:
|
||||
# sntmp = series_name.split()
|
||||
|
|
@ -713,8 +703,9 @@ class FileChecker(object):
|
|||
if issue_number is None or series_name is None:
|
||||
logger.fdebug('Cannot parse the filename properly. I\'m going to make note of this filename so that my evil ruler can make it work.')
|
||||
return {'parse_status': 'failure',
|
||||
'sub': path_list,
|
||||
'comicfilename': filename,
|
||||
'comiclocation': clocation,
|
||||
'comiclocation': self.dir,
|
||||
'series_name': series_name,
|
||||
'issue_number': issue_number,
|
||||
'justthedigits': issue_number, #redundant but it's needed atm
|
||||
|
|
@ -728,7 +719,7 @@ class FileChecker(object):
|
|||
'type': re.sub('\.','', filetype).strip(),
|
||||
'sub': path_list,
|
||||
'comicfilename': filename,
|
||||
'comiclocation': clocation,
|
||||
'comiclocation': self.dir,
|
||||
'series_name': series_name,
|
||||
'series_volume': issue_volume,
|
||||
'issue_year': issue_year,
|
||||
|
|
@ -738,7 +729,7 @@ class FileChecker(object):
|
|||
series_info = {}
|
||||
series_info = {'sub': path_list,
|
||||
'comicfilename': filename,
|
||||
'comiclocation': clocation,
|
||||
'comiclocation': self.dir,
|
||||
'series_name': series_name,
|
||||
'series_volume': issue_volume,
|
||||
'issue_year': issue_year,
|
||||
|
|
@ -885,6 +876,7 @@ class FileChecker(object):
|
|||
comicsize = os.path.getsize(os.path.join(dir, fname))
|
||||
else:
|
||||
comicsize = os.path.getsize(os.path.join(dir, direc, fname))
|
||||
|
||||
filelist.append({'directory': direc, #subdirectory if it exists
|
||||
'filename': fname,
|
||||
'comicsize': comicsize})
|
||||
|
|
|
|||
Loading…
Reference in a new issue