github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-16 02:02:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed our cleanDir function so that we now pass in path, section, and subsection instead of it just trying to do a recursive clean.

Browse source
This commit is contained in:
echel0n 2014-04-25 02:56:00 -07:00
parent 175f023224
commit 6594433ca5
4 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
TorrentToMedia.py
View file

@ -202,7 +202,7 @@ def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID,
nzbtomedia.remove_torrent(clientAgent, inputHash, inputID, inputName) nzbtomedia.remove_torrent(clientAgent, inputHash, inputID, inputName)
# cleanup our processing folders of any misc unwanted files and empty directories # cleanup our processing folders of any misc unwanted files and empty directories
nzbtomedia.cleanProcDirs() nzbtomedia.cleanDir(inputDirectory, sectionName, inputCategory)
return result return result

4
nzbToMedia.py
View file

@ -282,7 +282,7 @@ from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames
from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie
from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic
from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV
from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanProcDirs, update_downloadInfoStatus, get_downloadInfo from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo
from nzbtomedia import logger, nzbToMediaDB from nzbtomedia import logger, nzbToMediaDB
# post-processing # post-processing
@ -351,7 +351,7 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down
update_downloadInfoStatus(inputName, 1) update_downloadInfoStatus(inputName, 1)
# cleanup our processing folders of any misc unwanted files and empty directories # cleanup our processing folders of any misc unwanted files and empty directories
cleanProcDirs() cleanDir(inputDirectory, sectionName, inputCategory)
return result return result

2
nzbtomedia/__init__.py
View file

@ -30,7 +30,7 @@ from nzbtomedia import logger, versionCheck, nzbToMediaDB
from nzbtomedia.nzbToMediaConfig import config from nzbtomedia.nzbToMediaConfig import config
from nzbtomedia.nzbToMediaUtil import category_search, sanitizeName, copy_link, parse_args, flatten, getDirs, \ from nzbtomedia.nzbToMediaUtil import category_search, sanitizeName, copy_link, parse_args, flatten, getDirs, \
rmReadOnly,rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles, \ rmReadOnly,rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles, \
extractFiles, cleanProcDirs, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanProcDirs, \ extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanDir, \
create_torrent_class, listMediaFiles create_torrent_class, listMediaFiles
from nzbtomedia.transcoder import transcoder from nzbtomedia.transcoder import transcoder
from nzbtomedia.databases import mainDB from nzbtomedia.databases import mainDB

35
nzbtomedia/nzbToMediaUtil.py
View file

@ -456,26 +456,23 @@ def rmDir(dirName):
except: except:
logger.error("Unable to delete folder %s" % (dirName)) logger.error("Unable to delete folder %s" % (dirName))
def cleanProcDirs(): def cleanDir(path, section, subsection):
logger.info('Cleaning processing directories ...', 'CLEANDIRS') logger.info('Cleaning directory:%s ...' % (path), 'CLEANDIRS')
for section, subsections in nzbtomedia.SECTIONS.items(): try:
for subsection in subsections: minSize = int(nzbtomedia.CFG[section][subsection]['minSize'])
for dirName in nzbtomedia.getDirs(section,subsection): except:minSize = 0
try: try:
minSize = int(nzbtomedia.CFG[section][subsection]['minSize']) delete_ignored = int(nzbtomedia.CFG[section][subsection]['delete_ignored'])
except:minSize = 0 except:delete_ignored = 0
try:
delete_ignored = int(nzbtomedia.CFG[section][subsection]['delete_ignored'])
except:delete_ignored = 0
num_files = len(listMediaFiles(dirName, minSize=minSize, delete_ignored=delete_ignored))
if num_files > 0:
logger.info(
"Directory %s still contains %s unprocessed file(s), skipping ..." % (dirName, num_files),
'CLEANDIRS')
continue
logger.info("Directory %s has already been processed, removing ..." % (dirName), 'CLEANDIRS') num_files = len(listMediaFiles(path, minSize=minSize, delete_ignored=delete_ignored))
shutil.rmtree(dirName) if num_files > 0:
logger.info(
"Directory %s still contains %s unprocessed file(s), skipping ..." % (path, num_files),
'CLEANDIRS')
logger.info("Directory %s has already been processed, removing ..." % (path), 'CLEANDIRS')
shutil.rmtree(path)
def create_torrent_class(clientAgent): def create_torrent_class(clientAgent):
# Hardlink solution for Torrents # Hardlink solution for Torrents