Added a try except to remove and a todo to remind of need improvements.
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
# @Author: KevinMidboe
|
# @Author: KevinMidboe
|
||||||
# @Date: 2017-04-12 23:27:51
|
# @Date: 2017-04-12 23:27:51
|
||||||
# @Last Modified by: KevinMidboe
|
# @Last Modified by: KevinMidboe
|
||||||
# @Last Modified time: 2017-06-27 15:33:12
|
# @Last Modified time: 2017-06-27 15:37:26
|
||||||
|
|
||||||
import sys, sqlite3, json, os
|
import sys, sqlite3, json, os
|
||||||
import logging
|
import logging
|
||||||
@@ -75,7 +75,14 @@ def moveStray(strayId):
|
|||||||
logging.warning(ep.typeDir('parent', mergeItem=item) + 'does not exist, cannot be removed.')
|
logging.warning(ep.typeDir('parent', mergeItem=item) + 'does not exist, cannot be removed.')
|
||||||
|
|
||||||
fix_ownership(ep.typeDir('episode'))
|
fix_ownership(ep.typeDir('episode'))
|
||||||
|
|
||||||
|
|
||||||
|
# TODO because we might jump over same files, the dir might no longer
|
||||||
|
# be empty and cannot remove dir like this.
|
||||||
|
try:
|
||||||
os.rmdir(ep.typeDir('parent'))
|
os.rmdir(ep.typeDir('parent'))
|
||||||
|
except FileNotFoundError:
|
||||||
|
logging.warning('Cannot remove ' + ep.typeDir('parent') + ', file no longer exists.')
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
if (os.path.exists(env.logfile)):
|
if (os.path.exists(env.logfile)):
|
||||||
|
|||||||
Reference in New Issue
Block a user