ecopipeline 0.7.5__py3-none-any.whl → 0.7.6__py3-none-any.whl

ecopipeline/extract/extract.py

@@ -151,11 +151,17 @@ def extract_new(startTime: datetime, filenames: List[str], decihex = False, time
 
 
     else: 
+        endTime_int = endTime
         if epochFormat:
             startTime_int = int(startTime.timestamp())
+            if not endTime is None:
+                endTime_int = int(endTime.timestamp())
         else:
             startTime_int = int(startTime.strftime(dateFormat))
-        return_list = list(filter(lambda filename: int(filename[dateStringStartIdx:dateStringEndIdx]) >= startTime_int and (endTime is None or int(filename[dateStringStartIdx:dateStringStartIdx+14]) < int(endTime.strftime("%Y%m%d%H%M%S"))), filenames))
+            if not endTime is None:
+                endTime_int = int(endTime.strftime(dateFormat)
+                                  )
+        return_list = list(filter(lambda filename: int(filename[dateStringStartIdx:dateStringEndIdx]) >= startTime_int and (endTime_int is None or int(filename[dateStringStartIdx:dateStringEndIdx]) < endTime_int), filenames))
     return return_list
 
 def extract_files(extension: str, config: ConfigManager, data_sub_dir : str = "", file_prefix : str = "") -> List[str]:

{ecopipeline-0.7.5.dist-info → ecopipeline-0.7.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecopipeline
-Version: 0.7.5
+Version: 0.7.6
 Summary: Contains functions for use in Ecotope Datapipelines
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: GNU General Public License (GPL)

{ecopipeline-0.7.5.dist-info → ecopipeline-0.7.6.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ecopipeline/__init__.py,sha256=vCRzwd781ciCSXMP1ycM_BXAqxj3KVaNKIjsLOPcbwc,171
 ecopipeline/extract/__init__.py,sha256=3u_CUMdCguVewU3kN8x6xhVNyo1-p-gwTrhjOh7Psqg,645
-ecopipeline/extract/extract.py,sha256=heWcWTeRVTRITh_1sHVnkaKOOi5PwUOEVIi4k5tw2Z8,43384
+ecopipeline/extract/extract.py,sha256=Fg1zUWESLVMV8apwCIu7s--t4qqRIO0vz5eM5jAnpE4,43613
 ecopipeline/load/__init__.py,sha256=NLa_efQJZ8aP-J0Y5xx9DP7mtfRH9jY6Jz1ZMZN_BAA,292
 ecopipeline/load/load.py,sha256=D3KdQZ08hYRso42p59YE-eVQaTHuANCJ0YeJvRnOgG4,23078
 ecopipeline/transform/__init__.py,sha256=hYb4F64fXdXtjBSYCqv6gLFBwKZjjnl0z7s291pFE98,2505
@@ -10,8 +10,8 @@ ecopipeline/transform/transform.py,sha256=DBQD4WqKmdXnGQMAj6tg75HtXiSemIc7c6nZxz
 ecopipeline/utils/ConfigManager.py,sha256=avhUEpx7WhhmnT-MB8OQ_siVgS1k5zp7KCYOyzzOJkE,10506
 ecopipeline/utils/__init__.py,sha256=ccWUR0m7gD9DfcgsxBCLOfi4lho6RdYuB2Ugy_g6ZdQ,28
 ecopipeline/utils/unit_convert.py,sha256=VFh1we2Y8KV3u21BeWb-U3TlZJXo83q5vdxxkpgcuME,3064
-ecopipeline-0.7.5.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ecopipeline-0.7.5.dist-info/METADATA,sha256=rj-QU_0DXM8mf-P6vLFzhxRB5ErzXVkqTMWFhA3ZywU,2329
-ecopipeline-0.7.5.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-ecopipeline-0.7.5.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
-ecopipeline-0.7.5.dist-info/RECORD,,
+ecopipeline-0.7.6.dist-info/licenses/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ecopipeline-0.7.6.dist-info/METADATA,sha256=7FW9Ttnogj_NseuwtWy5SbvXFRVH2hp7McSLQ4wizAM,2329
+ecopipeline-0.7.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecopipeline-0.7.6.dist-info/top_level.txt,sha256=WOPFJH2LIgKqm4lk2OnFF5cgVkYibkaBxIxgvLgO7y0,12
+ecopipeline-0.7.6.dist-info/RECORD,,

{ecopipeline-0.7.5.dist-info → ecopipeline-0.7.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any