fix: revert — keep original filenames inside ZIP
Deploy contracts-flask / validate (push) Successful in 0s

This commit is contained in:
2026-06-29 15:07:40 +04:00
parent 3a948902ff
commit 433e2c38f8
2 changed files with 2 additions and 14 deletions
+1 -7
View File
@@ -17,7 +17,6 @@ import logging
import tempfile import tempfile
import os import os
import shutil import shutil
import datetime
from typing import Dict, List, Tuple, Callable, Optional from typing import Dict, List, Tuple, Callable, Optional
log = logging.getLogger("drhider") log = logging.getLogger("drhider")
@@ -211,12 +210,7 @@ class TwoPassObfuscator:
# --- Проход 2: замена --- # --- Проход 2: замена ---
results = [] results = []
ts = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
seq = 0
for fname, content, ctype in files: for fname, content, ctype in files:
seq += 1
ext = os.path.splitext(fname)[1] or ".tmp"
clean_name = f"doc_{ts}_{seq:03d}{ext}"
obf_content = content obf_content = content
if fname in all_docx: if fname in all_docx:
# Замена внутри docx # Замена внутри docx
@@ -229,7 +223,7 @@ class TwoPassObfuscator:
txt = all_texts.get(fname, '') txt = all_texts.get(fname, '')
obf_content = self._replace_in_text(txt, fname) obf_content = self._replace_in_text(txt, fname)
results.append((clean_name, obf_content)) results.append((fname, obf_content))
# Собираем ZIP + CSV # Собираем ZIP + CSV
csv_str = self._build_mapping_csv() csv_str = self._build_mapping_csv()
+1 -7
View File
@@ -17,7 +17,6 @@ import logging
import tempfile import tempfile
import os import os
import shutil import shutil
import datetime
from typing import Dict, List, Tuple, Callable, Optional from typing import Dict, List, Tuple, Callable, Optional
log = logging.getLogger("drhider") log = logging.getLogger("drhider")
@@ -211,12 +210,7 @@ class TwoPassObfuscator:
# --- Проход 2: замена --- # --- Проход 2: замена ---
results = [] results = []
ts = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
seq = 0
for fname, content, ctype in files: for fname, content, ctype in files:
seq += 1
ext = os.path.splitext(fname)[1] or ".tmp"
clean_name = f"doc_{ts}_{seq:03d}{ext}"
obf_content = content obf_content = content
if fname in all_docx: if fname in all_docx:
# Замена внутри docx # Замена внутри docx
@@ -229,7 +223,7 @@ class TwoPassObfuscator:
txt = all_texts.get(fname, '') txt = all_texts.get(fname, '')
obf_content = self._replace_in_text(txt, fname) obf_content = self._replace_in_text(txt, fname)
results.append((clean_name, obf_content)) results.append((fname, obf_content))
# Собираем ZIP + CSV # Собираем ZIP + CSV
csv_str = self._build_mapping_csv() csv_str = self._build_mapping_csv()