fixing dataset procesosrs

1 files changed, 16 insertions, 4 deletions

diff --git a/megapixels/app/models/data_store.py b/megapixels/app/models/data_store.py
index 8ec1f8ba..244aba60 100644
--- a/megapixels/app/models/data_store.py
+++ b/megapixels/app/models/data_store.py
@@ -21,15 +21,27 @@ class DataStore:
   def metadata(self, enum_type):
     return join(self.dir_metadata, f'{enum_type.name.lower()}.csv')
 
+  def metadata(self, enum_type):
+    return join(self.dir_metadata)
+
   def media_images_original(self):
     return join(self.dir_media, 'original')
 
-  def face_image(self, subdir, fn, ext):
+  def face(self, subdir, fn, ext):
     return join(self.dir_media, 'original', subdir, f'{fn}.{ext}')
 
-  def face_image_crop(self, subdir, fn, ext):
+  def face_crop(self, subdir, 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}')
+
+  def face_crop_uuid(self, uuid, ext):
+    return join(self.dir_media, 'uuid', f'{uuid}.{ext}')
+
+  def uuid_dir(self):
+    return join(self.dir_media, 'uuid')
+
 
 class DataStoreS3:
   # S3 server
@@ -40,11 +52,11 @@ class DataStoreS3:
   def metadata(self, opt_metadata_type, ext='csv'):
     return join(self._dir_metadata, f'{opt_metadata_type.name.lower()}.{ext}')
 
-  def face_image(self, opt_uuid, ext='jpg'):
+  def face(self, opt_uuid, ext='jpg'):
     #return join(self._dir_media, 'original', f'{opt_uuid}.{ext}')
     return join(self._dir_media, f'{opt_uuid}.{ext}')
 
-  def face_image_crop(self, opt_uuid, ext='jpg'):
+  def face_crop(self, opt_uuid, ext='jpg'):
     # not currently using?
     return join(self._dir_media, 'cropped', f'{opt_uuid}.{ext}')