🎨 Remove base directories Repository and Archive (close #48)

bdc_collectors/base.py

@@ -94,7 +94,7 @@ def path(self, collection: Collection, prefix=None) -> Path:
 
         year_month = sensing_date.strftime('%Y-%m')
 
-        scene_path = Path(prefix or '') / 'Repository/Archive' / collection.name / year_month / self.parser.tile_id()
+        scene_path = Path(prefix or '') / collection.name / year_month / self.parser.tile_id()
 
         scene_path = scene_path / self.parser.scene_id
 

bdc_collectors/dgi/collections.py

@@ -68,7 +68,7 @@ def path(self, collection: Collection, prefix=None) -> Path:
 
         version = 'v{0:03d}'.format(collection.version)
 
-        scene_path = Path(prefix or '') / 'Repository/Archive' / collection.name / version / year_month
+        scene_path = Path(prefix or '') / collection.name / version / year_month
 
         return scene_path
 

bdc_collectors/modis/collection.py

@@ -49,10 +49,7 @@ def path(self, collection: Collection, prefix=None, cube_prefix=None) -> Path:
 
         relative = Path(collection.name) / version / tile[:3] / tile[3:] / year / scene_id
 
-        if cube_prefix is None:
-            cube_prefix = 'Mosaic' if collection.collection_type == 'cube' else 'Archive'
-
-        scene_path = Path(prefix or '') / f'Repository/{cube_prefix}' / relative
+        scene_path = Path(prefix or '') / relative
 
         return scene_path
 

bdc_collectors/scihub/base.py

@@ -80,7 +80,7 @@ def compressed_file(self, collection, prefix=None):
 
         relative = Path(collection.name) / version / tile[:2] / tile[2] / tile[3:] / year / scene_id
 
-        scene_path = Path(prefix or '') / 'Repository/Archive' / relative
+        scene_path = Path(prefix or '') / relative
 
         return scene_path / f'{scene_id}.zip'
 
@@ -95,7 +95,7 @@ def path(self, collection: Collection, prefix=None) -> Path:
 
         relative = Path(collection.name) / version / tile[:2] / tile[2] / tile[3:] / year / self.parser.scene_id
 
-        scene_path = Path(prefix or '') / 'Repository/Archive' / relative
+        scene_path = Path(prefix or '') / relative
 
         return scene_path
 

bdc_collectors/usgs/base.py

@@ -36,7 +36,7 @@ def _path(self, collection: Collection, prefix=None) -> Path:
 
         path, row = tile_id[:3], tile_id[-3:]
 
-        scene_path = base / 'Repository/Archive' / collection.name / version / path / row / year / scene_id
+        scene_path = base / collection.name / version / path / row / year / scene_id
 
         return scene_path
 
@@ -97,7 +97,7 @@ def path(self, collection: Collection, prefix=None) -> Path:
 
         year_month = sensing_date.strftime('%Y-%m')
 
-        scene_path = Path(prefix or '') / 'Repository/Archive' / collection.name / year_month / self.parser.tile_id()
+        scene_path = Path(prefix or '') / collection.name / year_month / self.parser.tile_id()
 
         return scene_path