minor change to S3__Key_Generator

Author: DinisCruz

osbot_aws/aws/s3/S3__Key_Generator.py

@@ -41,10 +41,7 @@ def create_path_elements__from_when(self, when=None, area: Safe_Id = None):
             if not when:
                 when = self.path__for_date_time__now_utc()
             if when:                                            # for the cases when path__for_date_time__now_utc returns and empty value
-                if self.split_when:
-                    path_elements.extend(when.split('-'))
-                else:
-                    path_elements.append(when)
+                path_elements.append(when)
 
 
 
@@ -71,7 +68,10 @@ def path__for_date_time(self, date_time):
         minute_block = self.calculate_minute_block(minute)
         path_components = []
         if self.use_date:
-            path_components.append(date_path   )
+            if self.split_when:
+                path_components.extend(date_path.split('-'))
+            else:
+                path_components.append(date_path   )
         if self.use_hours:
             path_components.append(hour_path   )
         if self.use_minutes:

tests/unit/aws/s3/test_S3__Key_Generator.py

@@ -157,31 +157,31 @@ def test_create_path_elements__from_when__with_area_and_split(self):
 
             # Test split_when parameter
             _.split_when = True
-            expected = ['root', 'server1', 'test-area', '2021','01','01/12/00']
+            expected = ['root', 'server1', 'test-area', '2021-01-01/12/00']
             result = _.create_path_elements__from_when(when=when, area=area)
 
             assert result == expected
 
             # Test with no area but split_when
             _.split_when = True
             area = None
-            expected = ['root', 'server1', '2021','01','01/12/00']
+            expected = ['root', 'server1', '2021-01-01/12/00']
             result = _.create_path_elements__from_when(when=when, area=area)
             assert result == expected
 
             # Test with use_when=False
             _.use_when = False
-            area = Safe_Id('test-area')
+            area     = Safe_Id('test-area')
             expected = ['root', 'server1', 'test-area']
-            result = _.create_path_elements__from_when(when=when, area=area)
+            result   = _.create_path_elements__from_when(when=when, area=area)
             assert result == expected
 
             # Test with actual datetime path generation
-            _.use_when = True
+            _.use_when   = True
             _.split_when = True
             now_path = _.path__for_date_time__now_utc()
             result = _.create_path_elements__from_when(area=area)
-            assert len(result) == len(now_path.split('/')) + 3  # root, server1, area + split path
+            assert len(result) == len(now_path.split('/')) - 1
             assert result[0] == 'root'
             assert result[1] == 'server1'
             assert result[2] == 'test-area'