github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-14 10:36:52 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into dev

Browse source
This commit is contained in:
Clinton Hall 2017-06-13 22:36:42 +09:30 • committed by GitHub
commit f467213284
11 changed files with 535 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/nzbToMediaUtil.py
View file

@ -195,7 +195,7 @@ def getDirSize(inputPath):
from functools import partial
prepend = partial(os.path.join, inputPath)
return sum(
[(os.path.getsize(f) if os.path.isfile(f) else getDirSize(f)) for f in map(prepend, os.listdir(inputPath))])
[(os.path.getsize(f) if os.path.isfile(f) else getDirSize(f)) for f in map(prepend, os.listdir(unicode(inputPath)))])
def is_minSize(inputName, minSize):
@ -322,7 +322,7 @@ def removeEmptyFolders(path, removeRoot=True):
# remove empty subfolders
logger.debug("Checking for empty folders in:{0}".format(path))
files = os.listdir(path)
files = os.listdir(unicode(path))
if len(files):
for f in files:
fullpath = os.path.join(path, f)
@ -330,7 +330,7 @@ def removeEmptyFolders(path, removeRoot=True):
removeEmptyFolders(fullpath)
# if folder empty, delete it
files = os.listdir(path)
files = os.listdir(unicode(path))
if len(files) == 0 and removeRoot:
logger.debug("Removing empty folder:{}".format(path))
os.rmdir(path)
@ -607,9 +607,9 @@ def getDirs(section, subsection, link='hard'):
folders = []
logger.info("Searching {0} for mediafiles to post-process ...".format(path))
sync = [o for o in os.listdir(path) if os.path.splitext(o)[1] in ['.!sync', '.bts']]
sync = [o for o in os.listdir(unicode(path)) if os.path.splitext(o)[1] in ['.!sync', '.bts']]
# search for single files and move them into their own folder for post-processing
for mediafile in [os.path.join(path, o) for o in os.listdir(path) if
for mediafile in [os.path.join(path, o) for o in os.listdir(unicode(path)) if
os.path.isfile(os.path.join(path, o))]:
if len(sync) > 0:
break
@ -673,11 +673,11 @@ def getDirs(section, subsection, link='hard'):
# removeEmptyFolders(path, removeRoot=False)
if os.listdir(path):
for dir in [os.path.join(path, o) for o in os.listdir(path) if
if os.listdir(unicode(path)):
for dir in [os.path.join(path, o) for o in os.listdir(unicode(path)) if
os.path.isdir(os.path.join(path, o))]:
sync = [o for o in os.listdir(dir) if os.path.splitext(o)[1] in ['.!sync', '.bts']]
if len(sync) > 0 or len(os.listdir(dir)) == 0:
sync = [o for o in os.listdir(unicode(dir)) if os.path.splitext(o)[1] in ['.!sync', '.bts']]
if len(sync) > 0 or len(os.listdir(unicode(dir))) == 0:
continue
folders.extend([dir])
return folders
@ -728,7 +728,7 @@ def onerror(func, path, exc_info):
def rmDir(dirName):
logger.info("Deleting {0}".format(dirName))
try:
shutil.rmtree(dirName, onerror=onerror)
shutil.rmtree(unicode(dirName), onerror=onerror)
except:
logger.error("Unable to delete folder {0}".format(dirName))
@ -994,7 +994,7 @@ def listMediaFiles(path, minSize=0, delete_ignored=0, media=True, audio=True, me
return files
for curFile in os.listdir(path):
for curFile in os.listdir(unicode(path)):
fullCurFile = os.path.join(path, curFile)
# if it's a folder do it recursively
@ -1031,7 +1031,7 @@ def find_imdbid(dirName, inputName, omdbApiKey):
logger.info("Found imdbID [{0}]".format(imdbid))
return imdbid
if os.path.isdir(dirName):
for file in os.listdir(dirName):
for file in os.listdir(unicode(dirName)):
m = re.search('(tt\d{7})', file)
if m:
imdbid = m.group(1)
@ -1047,7 +1047,10 @@ def find_imdbid(dirName, inputName, omdbApiKey):
logger.info("Found imdbID [{0}] from DNZB-MoreInfo".format(imdbid))
return imdbid
logger.info('Searching IMDB for imdbID ...')
guess = guessit.guessit(inputName)
try:
guess = guessit.guessit(inputName)
except:
guess = None
if guess:
# Movie Title
title = None
@ -1072,12 +1075,15 @@ def find_imdbid(dirName, inputName, omdbApiKey):
logger.error("Unable to open URL {0}".format(url))
return
results = r.json()
try:
results = r.json()
except:
logger.error("No json data returned from omdbapi.com")
try:
imdbid = results['imdbID']
except:
pass
logger.error("No imdbID returned from omdbapi.com")
if imdbid:
logger.info("Found imdbID [{0}]".format(imdbid))