oneCInteraction 1.4.0__tar.gz → 1.4.2__tar.gz

{onecinteraction-1.4.0/src/oneCInteraction.egg-info → onecinteraction-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.4.0
+Version: 1.4.2
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

{onecinteraction-1.4.0 → onecinteraction-1.4.2}/src/oneCInteraction/nomenclature.py

@@ -1,4 +1,6 @@
 import os
+import glob
+import hashlib
 from datetime import datetime
 from .log import log_sys
 from . import structures
@@ -449,7 +451,7 @@ class NomenclatureManager:
             
         c_query = self.c_v8.NewObject("Query")
         c_query.Text = """
-            SELECT Объект AS ProductRef, Ссылка AS ImageRef, ВерсияДанных AS DataVersion, ИмяФайла AS FileName
+            SELECT Объект AS ProductRef, Ссылка AS ImageRef, ХешФайла AS DataVersion, ИмяФайла AS FileName
             FROM Справочник.ХранилищеДополнительнойИнформации
             WHERE Объект В (&ProductRefs) AND ПометкаУдаления = ЛОЖЬ
             ORDER BY Наименование
@@ -704,7 +706,7 @@ class NomenclatureManager:
         os.makedirs(s_imageDirIn, exist_ok=True)
 
         l_savedFilenames = []
-        l_imageUuids = getattr(c_productObjIn, 'l_images', [])
+        l_imageUuids = list(getattr(c_productObjIn, 'l_images', []))
 
         if not l_imageUuids:
             try:
@@ -714,7 +716,7 @@ class NomenclatureManager:
                 
                 c_query = self.c_v8.NewObject("Query")
                 c_query.Text = """
-                    SELECT Ссылка, ВерсияДанных AS DataVersion, ИмяФайла AS FileName
+                    SELECT Ссылка, ХешФайла AS DataVersion, ИмяФайла AS FileName
                     FROM Справочник.ХранилищеДополнительнойИнформации
                     WHERE Объект = &ProductRef AND ПометкаУдаления = ЛОЖЬ
                     ORDER BY Наименование
@@ -743,13 +745,10 @@ class NomenclatureManager:
             except Exception as e:
                 log_sys(f"Error fetching image references for {c_productObjIn.s_code}: {e}", 1)
 
-
-
-
-        import hashlib
-        import glob
-
         s_cleanProductUuid = str(getattr(c_productObjIn, 's_uuid', '')).replace('{', '').replace('}', '').replace('-', '')
+        if not s_cleanProductUuid:
+            log_sys(f"Cannot save images: product '{getattr(c_productObjIn, 's_name', getattr(c_productObjIn, 's_code', '?'))}' has no UUID.", 1)
+            return []
 
         for idx, img_info in enumerate(l_imageUuids):
             if isinstance(img_info, dict):
@@ -785,12 +784,19 @@ class NomenclatureManager:
                 c_binaryData = c_valueStorage.Get()
                 
                 if c_binaryData:
-                    # Remove older versions matching this slot
-                    for old_f in glob.glob(os.path.join(s_imageDirIn, f"{s_cleanProductUuid}_{idx}*")):
+                    # Remove older versions matching this exact slot
+                    for old_f in glob.glob(os.path.join(s_imageDirIn, f"{s_cleanProductUuid}_{idx}_*")):
                         try:
                             os.remove(old_f)
                         except OSError:
                             pass
+                    # Also try to remove the non-hashed legacy fallback if it exists
+                    legacy_f = os.path.join(s_imageDirIn, f"{s_cleanProductUuid}_{idx}.jpg")
+                    if os.path.exists(legacy_f):
+                        try:
+                            os.remove(legacy_f)
+                        except OSError:
+                            pass
                             
                     c_binaryData.Write(s_filePath)
                     if os.path.exists(s_filePath):

{onecinteraction-1.4.0 → onecinteraction-1.4.2/src/oneCInteraction.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oneCInteraction
-Version: 1.4.0
+Version: 1.4.2
 Summary: A Python library for interacting with 1C:Enterprise databases via COM connection.
 Author: agcl
 Classifier: Programming Language :: Python :: 3

onecinteraction-1.4.2/src/oneCInteraction.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "1.4.2",
+  "distance": 0,
+  "node": "gcfe51e6b4a107f559d67be8762bb7526f86e3c1a",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-09-05"
+}

onecinteraction-1.4.0/src/oneCInteraction.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "1.4.0",
-  "distance": 0,
-  "node": "gaae7e100da84f68e24d0db7651e06a01482ffeb0",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-09-03"
-}