fureunoir/schon
fureunoir/schon
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Features: 1) Add support for parsing files directly from zip-encoded streams.

Browse source 
Fixes: 1) Correct parsing logic to ensure consistent handling of file objects regardless of source type.

Extra: Refactor indentation and reduce duplicate logic for file parsing.
This commit is contained in:
Egor Pavlovich Gorbunov 2025-05-16 01:53:19 +03:00
parent 43c8df0c05
commit 97b877c943
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
geo/management/commands/cities.py
View file

@ -215,20 +215,31 @@ class Command(BaseCommand):
with zipfile.ZipFile(str(filepath)).open(name + ".txt", "r") as f: with zipfile.ZipFile(str(filepath)).open(name + ".txt", "r") as f:
zip_member = f zip_member = f
file_obj = io.TextIOWrapper(zip_member, encoding="utf-8") file_obj = io.TextIOWrapper(zip_member, encoding="utf-8")
for row in file_obj:
if not row.startswith("#"):
yield dict(
list(
zip(
settings.files[filekey]["fields"],
row.rstrip("\n").split("\t"),
)
)
)
else: else:
with open(os.path.join(self.data_dir, filename), encoding="utf-8") as f: with open(os.path.join(self.data_dir, filename), encoding="utf-8") as f:
file_obj = f file_obj = f
for row in file_obj: for row in file_obj:
if not row.startswith("#"): if not row.startswith("#"):
yield dict( yield dict(
list( list(
zip( zip(
settings.files[filekey]["fields"], settings.files[filekey]["fields"],
row.rstrip("\n").split("\t"), row.rstrip("\n").split("\t"),
)
)
) )
)
)
def parse(self, data): def parse(self, data):
for line in data: for line in data: