Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Añadir soporte para compresión ZIP en los ficheros F5D #62

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Añadir soporte para compresión ZIP en los ficheros F5D #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d464da3
Add ZIP support to F5d
davidmunoznovoa Feb 29, 2024
8884c46
Fix version control when ZIP file exists
davidmunoznovoa Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions mesures/f5d.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from mesures.headers import F5D_HEADER as COLUMNS
from mesures.f5 import F5, DTYPES
from mesures.utils import check_line_terminator_param
from zipfile import ZipFile
import os
import pandas as pd

Expand Down Expand Up @@ -80,10 +81,11 @@ def writer(self):
:return: file path of generated F5D File
"""
existing_files = os.listdir('/tmp')
if existing_files:
versions = [int(f.split('.')[1]) for f in existing_files if self.filename.split('.')[0] in f]
if versions:
self.version = max(versions) + 1
if self.default_compression != 'zip':
if existing_files:
versions = [int(f.split('.')[1]) for f in existing_files if self.filename.split('.')[0] in f and '.zip' not in f]
if versions:
self.version = max(versions) + 1

file_path = os.path.join('/tmp', self.filename)
kwargs = {'sep': ';',
Expand All @@ -95,5 +97,14 @@ def writer(self):
if self.default_compression:
kwargs.update({'compression': self.default_compression})

self.file.to_csv(file_path, **kwargs)
if kwargs.get('compression', False) == 'zip':
self.default_compression = False
zipped_file = ZipFile(os.path.join('/tmp', self.zip_filename), 'w')
file_path = os.path.join('/tmp', self.filename)
kwargs.update({'compression': False})
self.file.to_csv(file_path)
zipped_file.write(file_path, arcname=os.path.basename(file_path))
file_path = zipped_file.filename
else:
self.file.to_csv(file_path, **kwargs)
return file_path
7 changes: 7 additions & 0 deletions spec/generation_files_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,6 +675,13 @@ def get_sample_cups45_data():
expected = 'ES0012345678912345670F;2020/01/01 01:00;0;0;0;0;0;0;0;1;0;FE20214444'
assert f.file[f.columns].to_csv(sep=';', header=None, index=False).split('\n')[0] == expected

with it('gets expected content when uses ZIP compression'):
data = SampleData().get_sample_f5d_data()
f = F5D(data, compression='zip')
res = f.writer()
expected = 'ES0012345678912345670F;2020/01/01 01:00;0;0;0;0;0;0;0;1;0;FE20214444'
assert f.file[f.columns].to_csv(sep=';', header=None, index=False).split('\n')[0] == expected
assert '.zip' in res

with description('An F1'):
with it('is instance of F1 Class'):
Expand Down
Loading