updates

1 files changed, 34 insertions, 12 deletions

diff --git a/megapixels/app/models/data_store.py b/megapixels/app/models/data_store.py
index a8d6916f..b4260b9c 100644
--- a/megapixels/app/models/data_store.py
+++ b/megapixels/app/models/data_store.py
@@ -2,6 +2,7 @@ import os
 from os.path import join
 import logging
 
+from app.utils.logger_utils import Logger
 from app.settings import app_cfg as cfg
 from app.settings import types
 
@@ -11,41 +12,62 @@ from app.settings import types
 # -------------------------------------------------------------------------
 
 class DataStore:
+  
   # local data store
+  log = Logger.getLogger()
+
   def __init__(self, opt_data_store, opt_dataset):
     self.data_store = join(f'/data_store_{opt_data_store.name.lower()}')
-    self.dir_dataset = join(self.data_store, 'datasets', cfg.DIR_PEOPLE, opt_dataset.name.lower())
-    self.dir_media = join(self.dir_dataset, 'media')
-    self.dir_metadata = join(self.dir_dataset, 'metadata')
+    self._dir_dataset = join(self.data_store, 'datasets', cfg.DIR_PEOPLE, opt_dataset.name.lower())
+    self._dir_media = join(self._dir_dataset, 'media')
+    self._dir_metadata = join(self._dir_dataset, 'metadata')
 
   def metadata(self, enum_type):
-    return join(self.dir_metadata, f'{enum_type.name.lower()}.csv')
+    return join(self._dir_metadata, f'{enum_type.name.lower()}.csv')
+
+  @property
+  def dir_dataset(self):
+    return self._dir_dataset
+
+  @property
+  def dir_media(self):
+    return self._dir_media
+
+  @property
+  def dir_media_original(self):
+    return join(self._dir_media, 'original')
+
+  @property
+  def dir_metadata(self):
+    return self._dir_metadata
 
   def metadata_dir(self):
-    return join(self.dir_metadata)
+    self.log.warn('deprecated. use dir_metadata')
+    return self._dir_metadata
 
   def media_dir(self):
-    return join(self.dir_media)
+    self.log.warn('deprecated. use dir_media')
+    return self._dir_media
 
   def media_images_original(self):
-    return join(self.dir_media, 'original')
+    return join(self._dir_media, 'original')
 
   def face(self, subdir, fn, ext):
     if subdir == '' or subdir is None:
       subdir = '.'
-    return join(self.dir_media, 'original', subdir, f'{fn}.{ext}')
+    return join(self._dir_media, 'original', subdir, f'{fn}.{ext}')
 
   def face_crop(self, subdir, fn, ext):
-    return join(self.dir_media, 'cropped', subdir, f'{fn}.{ext}')
+    return join(self._dir_media, 'cropped', subdir, f'{fn}.{ext}')
 
   def face_uuid(self, uuid, ext):
-    return join(self.dir_media, 'uuid',f'{uuid}.{ext}')
+    return join(self._dir_media, 'uuid',f'{uuid}.{ext}')
 
   def face_crop_uuid(self, uuid, ext):
-    return join(self.dir_media, 'uuid', f'{uuid}.{ext}')
+    return join(self._dir_media, 'uuid', f'{uuid}.{ext}')
 
   def uuid_dir(self):
-    return join(self.dir_media, 'uuid')
+    return join(self._dir_media, 'uuid')
 
 
 class DataStoreS3: