gronod/headphones
1
0
Fork 1
mirror of https://github.com/rembo10/headphones.git synced 2026-05-02 09:49:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3151 from permster/develop

Browse Source 
Workaround for issue #2674
This commit is contained in:
AdeHub
2018-10-14 17:14:33 +13:00
committed by GitHub
parent 602e115a29 0264b1fb0d
commit bb8eb19dbf
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
headphones/helpers.py
View File

@@ -825,9 +825,11 @@ def smartMove(src, dest, delete=True):
source_dir = os.path.dirname(src) source_dir = os.path.dirname(src)
filename = os.path.basename(src) filename = os.path.basename(src)
source_path = os.path.join(source_dir, filename)
dest_path = os.path.join(dest, filename)
if os.path.isfile(os.path.join(dest, filename)): if os.path.isfile(dest_path):
logger.info('Destination file exists: %s', os.path.join(dest, filename)) logger.info('Destination file exists: %s', dest_path)
title = os.path.splitext(filename)[0] title = os.path.splitext(filename)[0]
ext = os.path.splitext(filename)[1] ext = os.path.splitext(filename)[1]
i = 1 i = 1
@@ -845,15 +847,29 @@ def smartMove(src, dest, delete=True):
src.decode(headphones.SYS_ENCODING, 'replace'), e) src.decode(headphones.SYS_ENCODING, 'replace'), e)
break break
try: if delete:
if delete: try:
shutil.move(os.path.join(source_dir, filename), os.path.join(dest, filename)) logger.info('Moving "%s" to "%s"', source_path, dest_path)
else: shutil.move(source_path, dest_path)
shutil.copy(os.path.join(source_dir, filename), os.path.join(dest, filename)) except Exception as e:
exists = os.path.exists(dest_path)
if exists and os.path.getsize(source_path) == os.path.getsize(dest_path):
logger.warn('Successfully moved file "%s", but something went wrong: %s',
filename.decode(headphones.SYS_ENCODING, 'replace'), e)
os.unlink(source_path)
else:
# remove faultly copied file
if exists:
os.unlink(dest_path)
raise
else:
try:
logger.info('Copying "%s" to "%s"', source_path, dest_path)
shutil.copy(source_path, dest_path)
return True return True
except Exception as e: except Exception as e:
logger.warn('Error moving file %s: %s', filename.decode(headphones.SYS_ENCODING, 'replace'), logger.warn('Error copying file %s: %s', filename.decode(headphones.SYS_ENCODING, 'replace'),
e) e)
def walk_directory(basedir, followlinks=True): def walk_directory(basedir, followlinks=True):