forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added _cleanup_tmp_files

Browse Source
This commit is contained in:
Rhet Turnbull
2019-11-13 21:48:50 -08:00
parent fc6d7b1cf5
commit b0a9e87d00
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
osxphotos/__init__.py
View File

@@ -85,6 +85,8 @@ class PhotosDB:
# configure AppleScripts used to manipulate Photos # configure AppleScripts used to manipulate Photos
self._setup_applescript() self._setup_applescript()
# set up the data structures used to store all the Photo database info
# Dict with information about all photos by uuid # Dict with information about all photos by uuid
self._dbphotos = {} self._dbphotos = {}
# Dict with information about all persons/photos by uuid # Dict with information about all persons/photos by uuid
@@ -102,6 +104,9 @@ class PhotosDB:
# Dict with information about all the volumes/photos by uuid # Dict with information about all the volumes/photos by uuid
self._dbvolumes = {} self._dbvolumes = {}
# list of temporary files created so we can clean them up later
self._tmp_files = []
# logger.debug(dbfile) # logger.debug(dbfile)
if dbfile is None: if dbfile is None:
library_path = self.get_photos_library_path() library_path = self.get_photos_library_path()
@@ -117,7 +122,9 @@ class PhotosDB:
self._scpt_quit.run() self._scpt_quit.run()
#TODO: add tmp files to a list and then delete them all when done (self->_delete_tmp_files)
self._tmp_db = self._copy_db_file(self._dbfile) self._tmp_db = self._copy_db_file(self._dbfile)
self._tmp_files.append(self._tmp_db)
self._get_db_version() self._get_db_version()
# zzz # zzz
@@ -133,6 +140,19 @@ class PhotosDB:
self._process_database() self._process_database()
def _cleanup_tmp_files(self):
print(f"DEBUG: tmp files ={self._tmp_files}")
for f in self._tmp_files:
print(f"DEBUG: cleaning up {f}")
try:
os.remove(f)
except Exception as e:
print(f"WARNING: Unable to remove tmp file {f}")
raise e
def __del__(self):
self._cleanup_tmp_files()
def keywords_as_dict(self): def keywords_as_dict(self):
# return keywords as dict of keyword, count in reverse sorted order (descending) # return keywords as dict of keyword, count in reverse sorted order (descending)
keywords = {} keywords = {}
@@ -299,6 +319,7 @@ class PhotosDB:
global _debug global _debug
(conn, c) = self._open_sql_file(self._tmp_db) (conn, c) = self._open_sql_file(self._tmp_db)
# (conn, c) = self._open_sql_file(self._dbfile)
# logger.debug("Have connection with database") # logger.debug("Have connection with database")
# get database version # get database version
@@ -319,7 +340,15 @@ class PhotosDB:
if int(self.__db_version) >= int(_PHOTOS_5_VERSION): if int(self.__db_version) >= int(_PHOTOS_5_VERSION):
print(f"DEBUG: version is {self.__db_version}") print(f"DEBUG: version is {self.__db_version}")
dbpath = Path(self._dbfile).parent
dbfile = dbpath / "Photos.sqlite"
print(f"DEBUG: dbfile = {dbfile}")
if not _check_file_exists(dbfile):
sys.exit(f"dbfile {dbfile} does not exist")
else:
self._dbfile = dbfile
sys.exit() sys.exit()
# TODO: now need to copy Photos.sqlite and replace _db_file # TODO: now need to copy Photos.sqlite and replace _db_file
# TODO: What if user passes Photos.sqlite? need to look for the photos.db file # TODO: What if user passes Photos.sqlite? need to look for the photos.db file
# or just throw error and tell user to pass photos.db # or just throw error and tell user to pass photos.db