From 979a95a468c829886fe60751586ad92aa09d4584 Mon Sep 17 00:00:00 2001 From: KevinMidboe Date: Tue, 27 Jun 2017 15:37:55 -0600 Subject: [PATCH] Added a try except to remove and a todo to remind of need improvements. --- moveSeasoned.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/moveSeasoned.py b/moveSeasoned.py index 995f8dc..c3995a8 100755 --- a/moveSeasoned.py +++ b/moveSeasoned.py @@ -3,7 +3,7 @@ # @Author: KevinMidboe # @Date: 2017-04-12 23:27:51 # @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 logging @@ -75,7 +75,14 @@ def moveStray(strayId): logging.warning(ep.typeDir('parent', mergeItem=item) + 'does not exist, cannot be removed.') fix_ownership(ep.typeDir('episode')) - os.rmdir(ep.typeDir('parent')) + + + # 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')) + except FileNotFoundError: + logging.warning('Cannot remove ' + ep.typeDir('parent') + ', file no longer exists.') if __name__ == '__main__': if (os.path.exists(env.logfile)):