proxsync 2.0.4__tar.gz → 2.0.5__tar.gz

{proxsync-2.0.4/proxsync.egg-info → proxsync-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.4
+Version: 2.0.5
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.4 → proxsync-2.0.5/proxsync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: proxsync
-Version: 2.0.4
+Version: 2.0.5
 Summary: NetBox plugin for Proxmox VE inventory synchronization
 Author-email: lixiujie85 <lixiujie85@gmail.com>
 License-Expression: MIT

{proxsync-2.0.4 → proxsync-2.0.5}/pve_sync.py

@@ -1084,6 +1084,11 @@ class OptimizedPVEToNetBoxSync:
                 disks[key] = m.group(1) if m else val_str[:80]
         return disks
 
+    @staticmethod
+    def _norm_desc(s) -> str:
+        """Normalize description: unify line endings, strip whitespace."""
+        return (s or '').replace('\r\n', '\n').replace('\r', '\n').strip()
+
     def _write_drift_event(self, vm_name: str, vmid: int, drift_type: str,
                            field_name: str, old_value: str, new_value: str,
                            notified: bool = False):
@@ -1461,8 +1466,8 @@ class OptimizedPVEToNetBoxSync:
                     self._write_drift_event(vm_name, vm_id, 'disk_change', k, old_v, new_v, notified=True)
 
         # VM 描述變更偵測
-        current_desc = (vm_config.get('description') or '').strip()[:500]
-        old_desc = (last_config.get('description') or '').strip()
+        current_desc = self._norm_desc(vm_config.get('description'))[:500]
+        old_desc = self._norm_desc(last_config.get('description'))
         if old_desc and old_desc != current_desc:
             self.stats['config_drifts_detected'] += 1
             print(f"📝 VM {vm_name} 描述變更")
@@ -1749,7 +1754,7 @@ class OptimizedPVEToNetBoxSync:
                                 vm_id=int(vm_id), cluster_name=self.cluster_name, config_hash=config_hash,
                                 memory=memory, vcpus=vcpus_save, tags=tag_names,
                                 node=node_name, primary_ip=cur_ip, vm_name=original_vm_name,
-                                description=(vm_config.get('description') or '').strip()[:500],
+                                description=self._norm_desc(vm_config.get('description'))[:500],
                                 disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                             )
                         except Exception as _snap_err:
@@ -1806,7 +1811,7 @@ class OptimizedPVEToNetBoxSync:
                 update_data = {
                     'name': vm_name, 'cluster': cluster['id'], 'device': device.id, 'role': role_id,
                     'vcpus': vcpus, 'memory': int(vm_config.get('memory', 0)), 'status': status,
-                    'description': (vm_config.get('description') or '')[:200], 'platform': platform_id,
+                    'description': self._norm_desc(vm_config.get('description'))[:200], 'platform': platform_id,
                     'start_on_boot': boot_choice
                 }
                 if tag_ids:
@@ -1825,7 +1830,7 @@ class OptimizedPVEToNetBoxSync:
                 vm_data_dict = {
                     'serial': vm_id, 'name': vm_name, 'cluster': cluster['id'], 'device': device.id,
                     'role': role_id, 'vcpus': vcpus, 'memory': int(vm_config.get('memory', 0)),
-                    'status': status, 'description': (vm_config.get('description') or '')[:200],
+                    'status': status, 'description': self._norm_desc(vm_config.get('description'))[:200],
                     'platform': platform_id, 'start_on_boot': boot_choice
                 }
                 if tag_ids:
@@ -1862,7 +1867,7 @@ class OptimizedPVEToNetBoxSync:
                     vm_id=int(vm_id), cluster_name=self.cluster_name, config_hash=config_hash,
                     memory=memory, vcpus=vcpus_save, tags=tag_names,
                     node=node_name, primary_ip=primary_ip_str, vm_name=original_vm_name,
-                    description=(vm_config.get('description') or '').strip()[:500],
+                    description=self._norm_desc(vm_config.get('description'))[:500],
                     disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                 )
             return True
@@ -1887,7 +1892,7 @@ class OptimizedPVEToNetBoxSync:
                             node=node_name,
                             primary_ip=_ip,
                             vm_name=original_vm_name,
-                            description=(vm_config.get('description') or '').strip()[:500],
+                            description=self._norm_desc(vm_config.get('description'))[:500],
                             disk_summary=json.dumps(self._parse_disk_summary(vm_config)),
                         )
                 except Exception:

{proxsync-2.0.4 → proxsync-2.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "proxsync"
-version = "2.0.4"
+version = "2.0.5"
 description = "NetBox plugin for Proxmox VE inventory synchronization"
 readme = "README.md"
 requires-python = ">=3.10"

{proxsync-2.0.4 → proxsync-2.0.5}/state_db.py

@@ -154,7 +154,7 @@ class StateDB:
             with sqlite3.connect(self.db_path) as conn:
                 conn.execute(
                     """
-                    INSERT INTO vm_config_history
+                    INSERT OR REPLACE INTO vm_config_history
                     (vm_id, cluster_name, config_hash, memory, vcpus, tags_json,
                      node, primary_ip, vm_name, description, disk_summary)
                     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -507,7 +507,7 @@ def compute_config_hash(vm_config: Dict[str, Any], tags: List[str], network_inte
         'ostype': vm_config.get('ostype', ''),
         'cores': vm_config.get('cores', 1),
         'sockets': vm_config.get('sockets', 1),
-        'description': vm_config.get('description', '')[:200],  # 限制长度
+        'description': (vm_config.get('description') or '').replace('\r\n', '\n').replace('\r', '\n').strip()[:200],
         'tags': sorted(tags),  # 排序以确保一致性
         'networks': net_config  # 添加网络接口配置
     }