fasdfsa commited on
Commit
62b2e1d
·
1 Parent(s): daf89d9

改图片命名,现在顺序正确了

Browse files
Files changed (1) hide show
  1. ocr/getdata.py +17 -1
ocr/getdata.py CHANGED
@@ -255,7 +255,23 @@ def _drain_network(
255
  if m2:
256
  page_id = f"_{m2.group(0)}"
257
 
258
- out_path = img_dir / f"{len(img_saved):04d}{page_id}{ext}"
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
259
  try:
260
  out_path.write_bytes(data)
261
  except Exception:
 
255
  if m2:
256
  page_id = f"_{m2.group(0)}"
257
 
258
+ # Default file name format
259
+ file_name = f"{len(img_saved):04d}{page_id}{ext}"
260
+
261
+ # Try to extract actual filename from URL, e.g. SWX0005_00001_00001.webp
262
+ m_name = re.search(r"-([a-zA-Z0-9_]+\.(?:webp|png|jpe?g|jpg|bmp))", url, re.IGNORECASE)
263
+ if m_name:
264
+ file_name = m_name.group(1)
265
+ else:
266
+ m_name2 = re.search(r"/([^/]+?\.(?:webp|png|jpe?g|jpg|bmp))(?:[?~]|$)", url, re.IGNORECASE)
267
+ if m_name2:
268
+ name_part = m_name2.group(1)
269
+ if "-" in name_part:
270
+ file_name = name_part.split("-", 1)[-1]
271
+ else:
272
+ file_name = name_part
273
+
274
+ out_path = img_dir / file_name
275
  try:
276
  out_path.write_bytes(data)
277
  except Exception: