monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-03 01:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #184 from JackDandy/feature/ChangeAllowsMoveFilesAcrossPartition

Browse source 
Change to allow file moving across partition.
This commit is contained in:
JackDandy 2015-07-16 14:02:18 +01:00
commit 456e6de634
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -8,6 +8,7 @@
* Update change to suppress HTTPS verification InsecureRequestWarning to updated package (ref:hacks.txt) * Update change to suppress HTTPS verification InsecureRequestWarning to updated package (ref:hacks.txt)
* Change to consolidate cache database migration code * Change to consolidate cache database migration code
* Change to only rebuild namecache on show update instead of on every search * Change to only rebuild namecache on show update instead of on every search
* Change to allow file moving across partition
* Add removal of old entries from namecache on show deletion * Add removal of old entries from namecache on show deletion
* Add Hallmark and specific ITV logos, remove logo of non-english Comedy Central Family * Add Hallmark and specific ITV logos, remove logo of non-english Comedy Central Family
* Fix provider TD failing to find episodes of air by date shows * Fix provider TD failing to find episodes of air by date shows

6
sickbeard/helpers.py
View file

@ -266,7 +266,7 @@ def copyFile(srcFile, destFile):
def moveFile(srcFile, destFile): def moveFile(srcFile, destFile):
try: try:
ek.ek(os.rename, srcFile, destFile) ek.ek(shutil.move, srcFile, destFile)
fixSetGroupID(destFile) fixSetGroupID(destFile)
except OSError: except OSError:
copyFile(srcFile, destFile) copyFile(srcFile, destFile)
@ -304,7 +304,7 @@ def symlink(src, dst):
def moveAndSymlinkFile(srcFile, destFile): def moveAndSymlinkFile(srcFile, destFile):
try: try:
ek.ek(os.rename, srcFile, destFile) ek.ek(shutil.move, srcFile, destFile)
fixSetGroupID(destFile) fixSetGroupID(destFile)
ek.ek(symlink, destFile, srcFile) ek.ek(symlink, destFile, srcFile)
except: except:
@ -396,7 +396,7 @@ def rename_ep_file(cur_path, new_path, old_path_length=0):
# move the file # move the file
try: try:
logger.log(u"Renaming file from " + cur_path + " to " + new_path) logger.log(u"Renaming file from " + cur_path + " to " + new_path)
ek.ek(os.rename, cur_path, new_path) ek.ek(shutil.move, cur_path, new_path)
except (OSError, IOError) as e: except (OSError, IOError) as e:
logger.log(u"Failed renaming " + cur_path + " to " + new_path + ": " + ex(e), logger.ERROR) logger.log(u"Failed renaming " + cur_path + " to " + new_path + ": " + ex(e), logger.ERROR)
return False return False