Qwael 3.9.5__tar.gz → 3.9.7__tar.gz

{qwael-3.9.5 → qwael-3.9.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Qwael
-Version: 3.9.5
+Version: 3.9.7
 Summary: Qwael: İşlevsel ve kolaylaştırılmış Python kütüphanesi
 Author: Bedirhan
 Author-email: bedirhan.oytpass@gmail.com

{qwael-3.9.5 → qwael-3.9.7}/Qwael/MultiDB.py

@@ -1,5 +1,6 @@
 import os
 import json
+import time
 
 # --- KIVY ANDROID DOSYA DESTEĞİ EKLENDİ ---
 try:
@@ -16,7 +17,13 @@ class MultiDB:
         # --- Android için doğru klasör ayarı ---
         if platform == "android":
             app = App.get_running_app()
-            filename = os.path.join(app.user_data_dir, filename)
+
+            if app:
+                # App çalışıyorsa user_data_dir kullan
+                filename = os.path.join(app.user_data_dir, filename)
+            else:
+                # App başlamamışsa geçici güvenli klasör
+                filename = os.path.join(os.getcwd(), filename)
         # ---------------------------------------
 
         self.filename = filename
@@ -30,12 +37,18 @@ class MultiDB:
     # LOCK SYSTEM
     # -----------------------------
     def _lock(self):
+        while os.path.exists(self.lockfile):
+            time.sleep(0.05)
+
         with open(self.lockfile, "w") as f:
             f.write("locked")
 
     def _unlock(self):
         if os.path.exists(self.lockfile):
-            os.remove(self.lockfile)
+            try:
+                os.remove(self.lockfile)
+            except Exception:
+                pass
 
     # -----------------------------
     # FILE I/O
@@ -77,31 +90,32 @@ class MultiDB:
     # -----------------------------
     def create_table(self, name, columns):
         self._lock()
-        lines = self._read()
+        try:
+            lines = self._read()
 
-        if self._find_table(lines, name) != -1:
-            self._unlock()
-            raise ValueError("Bu tablo zaten var!")
+            if self._find_table(lines, name) != -1:
+                raise ValueError("Bu tablo zaten var!")
 
-        col_names = []
-        rules = {}
+            col_names = []
+            rules = {}
 
-        for col in columns:
-            if isinstance(col, dict):
-                key = list(col.keys())[0]
-                rule = col[key]
-                col_names.append(key)
-                rules[key] = rule
-            else:
-                col_names.append(col)
-                rules[col] = ""
+            for col in columns:
+                if isinstance(col, dict):
+                    key = list(col.keys())[0]
+                    rule = col[key]
+                    col_names.append(key)
+                    rules[key] = rule
+                else:
+                    col_names.append(col)
+                    rules[col] = ""
 
-        lines.append(f"[TABLE {name}]")
-        lines.append(json.dumps(col_names, ensure_ascii=False))
-        lines.append(json.dumps(rules, ensure_ascii=False))
+            lines.append(f"[TABLE {name}]")
+            lines.append(json.dumps(col_names, ensure_ascii=False))
+            lines.append(json.dumps(rules, ensure_ascii=False))
 
-        self._write(lines)
-        self._unlock()
+            self._write(lines)
+        finally:
+            self._unlock()
 
     # -----------------------------
     # VALIDATION
@@ -146,8 +160,8 @@ class MultiDB:
         if not isinstance(values, (list, tuple)):
             values = [values]
 
+        self._lock()
         try:
-            self._lock()
             lines = self._read()
 
             tpos = self._find_table(lines, table)
@@ -159,12 +173,19 @@ class MultiDB:
 
             final_values = []
 
+            # Eğer ID otomatik eklenecekse
             if len(values) + 1 == len(col_names) and "ID" in rules.values():
                 auto_id = 1
                 idx = tpos + 3
                 while idx < len(lines) and not lines[idx].startswith("[TABLE"):
-                    row = json.loads(lines[idx])
-                    auto_id = max(auto_id, int(row[0]) + 1)
+                    try:
+                        row = json.loads(lines[idx])
+                        # güvenli int dönüşümü: boş/bozuk değerleri atla
+                        if isinstance(row[0], str) and row[0].isdigit():
+                            auto_id = max(auto_id, int(row[0]) + 1)
+                    except Exception:
+                        # bozuk satır varsa atla
+                        pass
                     idx += 1
 
                 final_values.append(str(auto_id))
@@ -176,14 +197,18 @@ class MultiDB:
             else:
                 final_values = list(values)
 
+            # validation
             for i, col in enumerate(col_names):
-                rule = rules[col]
+                rule = rules.get(col, "")
+                # eğer final_values eksikse hatayı fırlat
+                if i >= len(final_values):
+                    raise ValueError("Eksik veri!")
                 if not self._validate(final_values[i], rule, lines, tpos, i):
                     raise ValueError(f"{col} alanı için veri kurala uymuyor: {rule}")
 
+            # insert
             lines.insert(tpos + 3, json.dumps(final_values, ensure_ascii=False))
             self._write(lines)
-            self._unlock()
 
             if output_list is not None:
                 output_list.append(True)
@@ -220,91 +245,93 @@ class MultiDB:
     # -----------------------------
     def clear_full(self, table):
         self._lock()
-        lines = self._read()
-        tpos = self._find_table(lines, table)
-        if tpos == -1:
-            self._unlock()
-            raise ValueError("Tablo bulunamadı!")
+        try:
+            lines = self._read()
+            tpos = self._find_table(lines, table)
+            if tpos == -1:
+                raise ValueError("Tablo bulunamadı!")
 
-        new_lines = []
-        i = 0
-        while i < len(lines):
-            if i != tpos:
-                new_lines.append(lines[i])
-                i += 1
-                continue
+            new_lines = []
+            i = 0
+            while i < len(lines):
+                if i != tpos:
+                    new_lines.append(lines[i])
+                    i += 1
+                    continue
 
-            new_lines.append(lines[i])
-            new_lines.append(lines[i + 1])
-            new_lines.append(lines[i + 2])
+                new_lines.append(lines[i])
+                new_lines.append(lines[i + 1])
+                new_lines.append(lines[i + 2])
 
-            j = i + 3
-            while j < len(lines) and not lines[j].startswith("[TABLE"):
-                j += 1
-            i = j
+                j = i + 3
+                while j < len(lines) and not lines[j].startswith("[TABLE"):
+                    j += 1
+                i = j
 
-        self._write(new_lines)
-        self._unlock()
+            self._write(new_lines)
+        finally:
+            self._unlock()
 
     # -----------------------------
     # UPDATE TABLE
     # -----------------------------
     def table_update(self, table, columns):
         self._lock()
-        lines = self._read()
-        tpos = self._find_table(lines, table)
-        if tpos == -1:
-            self._unlock()
-            raise ValueError("Böyle bir tablo yok!")
-
-        col_names = []
-        rules = {}
-        for col in columns:
-            if isinstance(col, dict):
-                key = list(col.keys())[0]
-                col_names.append(key)
-                rules[key] = col[key]
-            else:
-                col_names.append(col)
-                rules[col] = ""
-
-        data_rows = []
-        idx = tpos + 3
-        while idx < len(lines) and not lines[idx].startswith("[TABLE"):
-            data_rows.append(json.loads(lines[idx]))
-            idx += 1
-
-        new_data_rows = []
-        old_cols = json.loads(lines[tpos + 1])
-        for row in data_rows:
-            new_row = []
-            for col in col_names:
-                if col in old_cols:
-                    new_row.append(row[old_cols.index(col)])
+        try:
+            lines = self._read()
+            tpos = self._find_table(lines, table)
+            if tpos == -1:
+                raise ValueError("Böyle bir tablo yok!")
+
+            col_names = []
+            rules = {}
+            for col in columns:
+                if isinstance(col, dict):
+                    key = list(col.keys())[0]
+                    col_names.append(key)
+                    rules[key] = col[key]
                 else:
-                    new_row.append("")
-            new_data_rows.append(new_row)
-
-        new_lines = []
-        i = 0
-        while i < len(lines):
-            if i == tpos:
-                new_lines.append(f"[TABLE {table}]")
-                new_lines.append(json.dumps(col_names, ensure_ascii=False))
-                new_lines.append(json.dumps(rules, ensure_ascii=False))
-                for row in new_data_rows:
-                    new_lines.append(json.dumps(row, ensure_ascii=False))
-
-                j = tpos + 3
-                while j < len(lines) and not lines[j].startswith("[TABLE"):
-                    j += 1
-                i = j
-            else:
-                new_lines.append(lines[i])
-                i += 1
+                    col_names.append(col)
+                    rules[col] = ""
+
+            data_rows = []
+            idx = tpos + 3
+            while idx < len(lines) and not lines[idx].startswith("[TABLE"):
+                data_rows.append(json.loads(lines[idx]))
+                idx += 1
+
+            new_data_rows = []
+            old_cols = json.loads(lines[tpos + 1])
+            for row in data_rows:
+                new_row = []
+                for col in col_names:
+                    if col in old_cols:
+                        new_row.append(row[old_cols.index(col)])
+                    else:
+                        new_row.append("")
+                new_data_rows.append(new_row)
+
+            new_lines = []
+            i = 0
+            while i < len(lines):
+                if i == tpos:
+                    new_lines.append(f"[TABLE {table}]")
+                    new_lines.append(json.dumps(col_names, ensure_ascii=False))
+                    new_lines.append(json.dumps(rules, ensure_ascii=False))
+                    for row in new_data_rows:
+                        new_lines.append(json.dumps(row, ensure_ascii=False))
+
+                    j = tpos + 3
+                    while j < len(lines) and not lines[j].startswith("[TABLE"):
+                        j += 1
+                    i = j
+                else:
+                    new_lines.append(lines[i])
+                    i += 1
 
-        self._write(new_lines)
-        self._unlock()
+            self._write(new_lines)
+        finally:
+            self._unlock()
 
     # -----------------------------
     # CONTROL SYSTEM
@@ -406,4 +433,58 @@ class MultiDB:
         if output_list is not None:
             output_list.append(found_value)
 
-        return found_value
+        return found_value
+
+    # -----------------------------
+    # REMOVE / DELETE ROW
+    # -----------------------------
+    def remove(self, table, row_id, output_list=None):
+        self._lock()
+        try:
+            lines = self._read()
+
+            tpos = self._find_table(lines, table)
+            if tpos == -1:
+                raise ValueError("Tablo bulunamadı!")
+
+            new_lines = []
+            removed = False
+
+            idx = 0
+            while idx < len(lines):
+                # tabloyu bulduk
+                if idx == tpos:
+                    new_lines.append(lines[idx])       # [TABLE ...]
+                    new_lines.append(lines[idx + 1])   # columns
+                    new_lines.append(lines[idx + 2])   # rules
+
+                    j = idx + 3
+                    # tablonun satırlarını dönen döngü
+                    while j < len(lines) and not lines[j].startswith("[TABLE"):
+                        row = json.loads(lines[j])
+                        if row[0] != str(row_id):
+                            new_lines.append(lines[j])
+                        else:
+                            removed = True
+                        j += 1
+
+                    idx = j
+                    continue
+
+                new_lines.append(lines[idx])
+                idx += 1
+
+            self._write(new_lines)
+
+            if output_list is not None:
+                output_list.append(removed)
+
+            return removed
+
+        except Exception:
+            if output_list is not None:
+                output_list.append(False)
+            raise
+
+        finally:
+            self._unlock()

{qwael-3.9.5 → qwael-3.9.7}/Qwael.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Qwael
-Version: 3.9.5
+Version: 3.9.7
 Summary: Qwael: İşlevsel ve kolaylaştırılmış Python kütüphanesi
 Author: Bedirhan
 Author-email: bedirhan.oytpass@gmail.com

{qwael-3.9.5 → qwael-3.9.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as f:
 
 setup(
     name="Qwael",
-    version="3.9.5",
+    version="3.9.7",
     packages=find_packages(),
     install_requires=[
         "google-api-python-client",