simo 2.11.1__py3-none-any.whl → 2.11.2__py3-none-any.whl

simo/backups/tasks.py

@@ -196,30 +196,124 @@ def get_backup_device(lsblk_data):
     partition’ – is used.
     """
 
+    _MIN_SIZE_BYTES = 32 * 1024 * 1024 * 1024  # 32 GiB – keep in sync with
+                                               # _find_blank_removable_device.
+
+    def _device_size_bytes(dev_name: str):
+        """Return size of *dev_name* in bytes (or ``None`` on failure)."""
+
+        for cmd in (
+            f"blockdev --getsize64 /dev/{dev_name}",
+            f"lsblk -b -dn -o SIZE /dev/{dev_name}",
+        ):
+            try:
+                out = subprocess.check_output(
+                    cmd, shell=True, stderr=subprocess.DEVNULL
+                ).strip()
+                return int(out)
+            except Exception:
+                continue
+        return None
+
+    # ------------------------------------------------------------------
+    # Helper: does the filesystem already contain legacy backups?
+    # ------------------------------------------------------------------
+
+    def _entry_has_simo_backups(entry: dict) -> bool:
+        """Return *True* when *entry* hosts legacy ``simo_backups`` folder.
+
+        The implementation borrows heavily from the _fs_is_empty() helper –
+        we temporarily mount the filesystem read-only when it is not mounted
+        yet, inspect the directory listing and clean everything up.
+        """
+
+        mountpoint = entry.get("mountpoint")
+        cleanup = False
+
+        if not mountpoint:
+            tmp_dir = f"/tmp/simo-bk-{uuid.uuid4().hex[:8]}"
+            try:
+                os.makedirs(tmp_dir, exist_ok=True)
+                res = subprocess.run(
+                    f"mount -o ro /dev/{entry['name']} {tmp_dir}",
+                    shell=True,
+                    stderr=subprocess.PIPE,
+                )
+                if res.returncode:
+                    shutil.rmtree(tmp_dir, ignore_errors=True)
+                    return False
+                mountpoint = tmp_dir
+                cleanup = True
+            except Exception:
+                shutil.rmtree(tmp_dir, ignore_errors=True)
+                return False
+
+        has_backups = os.path.isdir(os.path.join(mountpoint, "simo_backups"))
+
+        if cleanup:
+            subprocess.run(f"umount {mountpoint}", shell=True)
+            shutil.rmtree(mountpoint, ignore_errors=True)
+
+        return has_backups
+
+    # ------------------------------------------------------------------
+    # Phase 1 – look for properly prepared BACKUP partition **>=32 GiB**.
+    #          This is the preferred modern approach.
+    # ------------------------------------------------------------------
+
     for device in lsblk_data:
         if not device.get("hotplug"):
             continue
 
+        # Capacity check – skip devices smaller than the required threshold.
+        size_bytes = _device_size_bytes(device["name"])
+        if size_bytes is None:
+            print(f"Could not obtain capacity of: {device['name']}")
+            continue
+
+        if size_bytes < _MIN_SIZE_BYTES:
+            continue
+
         # Prefer partitions explicitly labelled "BACKUP".
         for child in device.get("children", []):
             if _has_backup_label(child):
                 return child
 
-        # Legacy fallback – whole-disk filesystems or partitions formatted as
-        # exFAT are still recognised in order to stay compatible with drives
-        # prepared by older software versions.
-        # NOTE:  We intentionally keep this logic after the new BACKUP label
-        # check so that freshly provisioned media (ext4+label) wins.
+        # Legacy fallback (modern capacity) – whole-disk or partitioned
+        # exFAT volumes are still acceptable for backward compatibility when
+        # they are large enough.
 
-        # 1. Whole-disk (no partition table) exFAT volume.
         if (device.get("fstype") or "").lower() == "exfat":
             return device
 
-        # 2. Partitioned removable drive – look for any exFAT child.
         for child in device.get("children", []):
             if (child.get("fstype") or "").lower() == "exfat":
                 return child
 
+
+    # ------------------------------------------------------------------
+    # Phase 2 – look for **existing** legacy backup drives.
+    # ------------------------------------------------------------------
+
+    if _find_blank_removable_device(lsblk_data):
+        # New empty disk is available, let's use it instead of trying to find
+        # legacy media
+        return None
+
+    for device in lsblk_data:
+        if not device.get("hotplug"):
+            continue
+
+        # Check the whole device first.
+        if device.get("mountpoint") or device.get("fstype"):
+            if _entry_has_simo_backups(device):
+                return device
+
+        # Check its partitions (if any).
+        for child in device.get("children", []):
+            if _entry_has_simo_backups(child):
+                return child
+
     # Nothing has been found.
     return None
 
@@ -577,6 +671,9 @@ def perform_backup():
     mac = str(hex(uuid.getnode()))
     device_backups_path = f'{sd_mountpoint}/simo_backups/hub-{mac}'
 
+    if not os.path.exists(device_backups_path):
+        os.makedirs(device_backups_path)
+
     drop_current_instance()
     hub_meta = {
         'instances': [inst.name for inst in Instance.objects.all()]
@@ -765,4 +862,4 @@ def setup_periodic_tasks(sender, **kwargs):
     sender.add_periodic_task(60 * 60, check_backups.s())
     # perform auto backup every 12 hours
     sender.add_periodic_task(60 * 60 * 12, perform_backup.s())
-    sender.add_periodic_task(60 * 60, clean_old_logs.s())
+    sender.add_periodic_task(60 * 60, clean_old_logs.s())

{simo-2.11.1.dist-info → simo-2.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simo
-Version: 2.11.1
+Version: 2.11.2
 Summary: Smart Home Supremacy
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.11.1.dist-info → simo-2.11.2.dist-info}/RECORD

@@ -65,7 +65,7 @@ simo/backups/admin.py,sha256=cEakxnQlOHvUf8LdBdekXpDAvnqPoVN8y7pnN3WK29A,2487
 simo/backups/dynamic_settings.py,sha256=Q52RLa3UQsmAhqkwR16cM6pbBnIbXqmVQ2oIUP2ZVD0,416
 simo/backups/models.py,sha256=-tgILgkqmBEuxBwoymKZN1a0UVQzmJvqWrIGYMMFDaQ,695
 simo/backups/rescue.img.xz,sha256=sErJUejbS9wMlmeLXeTbzOjOEsXxLnHMn0tTJpn2ITo,62389472
-simo/backups/tasks.py,sha256=7tF0mzOh3F5ZKwJpbVNDju235GHMauS7V1ughEkb09Y,27161
+simo/backups/tasks.py,sha256=ixNslDRYHd2Ujeji5EmTVFrOFPqBLKzgp2D1QgxHJWM,30620
 simo/backups/__pycache__/__init__.cpython-312.pyc,sha256=TAMZORllxjDG2r6KsDbR085kId1pURDKwMAaykHlt0w,125
 simo/backups/__pycache__/__init__.cpython-38.pyc,sha256=vzOf-JIMeZ6P85FyvTpYev3mscFosUy-SJTshcQbOHU,161
 simo/backups/__pycache__/admin.cpython-312.pyc,sha256=f0XBNqkwkFmJMx3C5328Axk_Ph6ZXElPrgOKN8pCuUY,3821
@@ -74,7 +74,7 @@ simo/backups/__pycache__/dynamic_settings.cpython-312.pyc,sha256=PpnbOuz78x3hFQY
 simo/backups/__pycache__/dynamic_settings.cpython-38.pyc,sha256=51gJFjn_XqQBRoHeubo6ppb9pNuFQKI5hAR0ms9flE8,731
 simo/backups/__pycache__/models.cpython-312.pyc,sha256=Re77ADeTs4A4SYXvAVJ3kscH4nAx9FtkagejTZRLI7s,1704
 simo/backups/__pycache__/models.cpython-38.pyc,sha256=zclX7HwOT4_izweyKNQ8LmgSHb3hNcYcfsSiwwfQoLY,1220
-simo/backups/__pycache__/tasks.cpython-312.pyc,sha256=KjHKNc2VdfHNirYWfT4uefiaBdiRWteBWCfUPXX_g3Y,18354
+simo/backups/__pycache__/tasks.cpython-312.pyc,sha256=lOvO_kMGq0I92G4oyCpun0aC2g3ebiD9fzavZFE6uns,34499
 simo/backups/__pycache__/tasks.cpython-38.pyc,sha256=bKz_Rxt_H0lC0d9_4Dxqv7cirQDSH9LVurZZC0LU94s,9179
 simo/backups/migrations/0001_initial.py,sha256=0LzCusTUyYf61ksiepdnqXIuYYNTNd_djh_Wa484HA0,770
 simo/backups/migrations/0002_backuplog_backup_level_backup_size.py,sha256=w9T9MQWuecy91OZE1fMExriwPuXA8HMPKsPwXhmC8_k,1023
@@ -11004,9 +11004,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.11.1.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.11.1.dist-info/METADATA,sha256=LYtFhwCsx8qEeImrazIlDoWZ2pl0BR7jYggxtNCgqmE,2028
-simo-2.11.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-simo-2.11.1.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.11.1.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.11.1.dist-info/RECORD,,
+simo-2.11.2.dist-info/licenses/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.11.2.dist-info/METADATA,sha256=mX2Y773CRkKjFdGgxztQ7qqsJLS13ICLvS9yI-lfQ3g,2028
+simo-2.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+simo-2.11.2.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.11.2.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.11.2.dist-info/RECORD,,