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

Refactor path functions from utils to utils.paths

Browse source
This commit is contained in:
Labrys of Knossos 2019-01-06 10:40:05 -05:00
commit e44c0bb56a
2 changed files with 37 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

45
core/utils/__init__.py
View file

@ -4,8 +4,6 @@ from __future__ import print_function, unicode_literals
import os import os
import re import re
import shutil
import stat
import beets import beets
import guessit import guessit
@ -41,12 +39,13 @@ from core.utils.parsers import (
parse_vuze, parse_vuze,
) )
from core.utils.paths import ( from core.utils.paths import (
clean_directory,
flatten_dir, flatten_dir,
get_dir_size, get_dir_size,
make_dir, make_dir,
onerror, onerror,
remove_dir,
remote_dir, remote_dir,
remove_dir,
remove_empty_folders, remove_empty_folders,
remove_read_only, remove_read_only,
) )
@ -163,6 +162,17 @@ def flatten(output_destination):
return flatten_dir(output_destination, list_media_files(output_destination)) return flatten_dir(output_destination, list_media_files(output_destination))
def clean_dir(path, section, subsection):
cfg = dict(core.CFG[section][subsection])
min_size = int(cfg.get('minSize', 0))
delete_ignored = int(cfg.get('delete_ignored', 0))
try:
files = list_media_files(path, min_size=min_size, delete_ignored=delete_ignored)
except Exception:
files = []
return clean_directory(path, files)
def get_dirs(section, subsection, link='hard'): def get_dirs(section, subsection, link='hard'):
to_return = [] to_return = []
@ -269,35 +279,6 @@ def get_dirs(section, subsection, link='hard'):
return list(set(to_return)) return list(set(to_return))
def clean_dir(path, section, subsection):
cfg = dict(core.CFG[section][subsection])
if not os.path.exists(path):
logger.info('Directory {0} has been processed and removed ...'.format(path), 'CLEANDIR')
return
if core.FORCE_CLEAN and not core.FAILED:
logger.info('Doing Forceful Clean of {0}'.format(path), 'CLEANDIR')
remove_dir(path)
return
min_size = int(cfg.get('minSize', 0))
delete_ignored = int(cfg.get('delete_ignored', 0))
try:
num_files = len(list_media_files(path, min_size=min_size, delete_ignored=delete_ignored))
except Exception:
num_files = 0
if num_files > 0:
logger.info(
'Directory {0} still contains {1} unprocessed file(s), skipping ...'.format(path, num_files),
'CLEANDIRS')
return
logger.info('Directory {0} has been processed, removing ...'.format(path), 'CLEANDIRS')
try:
shutil.rmtree(path, onerror=onerror)
except Exception:
logger.error('Unable to delete directory {0}'.format(path))
def find_imdbid(dir_name, input_name, omdb_api_key): def find_imdbid(dir_name, input_name, omdb_api_key):
imdbid = None imdbid = None

24
core/utils/paths.py
View file

@ -125,3 +125,27 @@ def flatten_dir(destination, files):
logger.error('Could not flatten {0}'.format(outputFile), 'FLATTEN') logger.error('Could not flatten {0}'.format(outputFile), 'FLATTEN')
remove_empty_folders(destination) # Cleanup empty directories remove_empty_folders(destination) # Cleanup empty directories
def clean_directory(path, files):
if not os.path.exists(path):
logger.info('Directory {0} has been processed and removed ...'.format(path), 'CLEANDIR')
return
if core.FORCE_CLEAN and not core.FAILED:
logger.info('Doing Forceful Clean of {0}'.format(path), 'CLEANDIR')
remove_dir(path)
return
if files:
logger.info(
'Directory {0} still contains {1} unprocessed file(s), skipping ...'.format(path, len(files)),
'CLEANDIRS',
)
return
logger.info('Directory {0} has been processed, removing ...'.format(path), 'CLEANDIRS')
try:
shutil.rmtree(path, onerror=onerror)
except Exception:
logger.error('Unable to delete directory {0}'.format(path))