gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-04-03 03:29:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Ade
2017-03-09 11:51:47 +13:00
parent 8c1621f604 dd1e4bfe3b
commit a45894b802
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/config.html
View File

@@ -1656,7 +1656,7 @@
<input type="text" name="cache_dir" value="${config['cache_dir']}" size="50">
</div>
<div class="row">
<label>Keep Files For Seeding Directory</label>
<label>Post Processing Temporary Directory</label>
<input type="text" name="keep_torrent_files_dir" value="${config['keep_torrent_files_dir']}" size="50" title="Enter the directory to preserve files for seeding, default is system temp directory">
</div>
</fieldset>

42
headphones/helpers.py
View File

@@ -634,28 +634,40 @@ def preserve_torrent_directory(albumpath):
tempdir = headphones.CONFIG.KEEP_TORRENT_FILES_DIR
else:
tempdir = tempfile.gettempdir()
prefix = "headphones_" + os.path.basename(os.path.normpath(albumpath)) + "_"
new_folder = tempfile.mkdtemp(prefix=prefix, dir=tempdir)
# Copy to temp dir
subdir = os.path.join(new_folder, "headphones")
logger.info("Copying files to " + subdir.decode(headphones.SYS_ENCODING,
'replace') + " subfolder to preserve downloaded files for seeding")
# Attempt to stop multiple temp dirs being created for the same albumpath
tempdir = os.path.join(tempdir, prefix)
if len(glob.glob(tempdir + '*/')) >= 3:
logger.error(
"Looks like a temp subfolder has previously been created for this albumpath, not continuing " + tempdir.decode(
headphones.SYS_ENCODING, 'replace'))
return None
logger.info("Preparing to copy to a temporary directory for post processing: " + albumpath.decode(
headphones.SYS_ENCODING, 'replace'))
try:
prefix = "headphones_" + os.path.basename(os.path.normpath(albumpath)) + "_"
new_folder = tempfile.mkdtemp(prefix=prefix, dir=tempdir)
except Exception as e:
logger.error("Cannot create temp directory: " + tempdir.decode(
headphones.SYS_ENCODING, 'replace') + ". Error: " + str(e))
return None
# Attempt to stop multiple temp dirs being created for the same albumpath
try:
workdir = os.path.join(tempdir, prefix)
workdir = re.sub(r'\[', '[[]', workdir)
workdir = re.sub(r'(?<!\[)\]', '[]]', workdir)
if len(glob.glob(workdir + '*/')) >= 3:
logger.error(
"Looks like a temp directory has previously been created for this albumpath, not continuing " + workdir.decode(
headphones.SYS_ENCODING, 'replace'))
return None
except Exception as e:
logger.warn("Cannot determine if already copied/processed, will copy anyway: Warning: " + str(e))
# Copy to temp dir
try:
subdir = os.path.join(new_folder, "headphones")
logger.info("Copying files to " + subdir.decode(headphones.SYS_ENCODING, 'replace'))
shutil.copytree(albumpath, subdir)
# Update the album path with the new location
return subdir
except Exception as e:
logger.warn("Cannot copy/move files to temp folder: " + new_folder.decode(headphones.SYS_ENCODING,
logger.warn("Cannot copy/move files to temp directory: " + new_folder.decode(headphones.SYS_ENCODING,
'replace') + ". Not continuing. Error: " + str(
e))
shutil.rmtree(new_folder)