Update

rustic.md

@@ -0,0 +1 @@
+Loading...

setup.cfg

@@ -13,6 +13,8 @@ license = MIT
 keywords =
     library
     json
+    sql
+    sqlite
     data
     shared
     binary
@@ -33,8 +35,7 @@ packages = find:
 include_package_data = true
 zip_safe = false
 install_requires =
-    probed
-    hackernote
+    jesth
 
 [options.entry_points]
 console_scripts =

shared/__init__.py

@@ -1,7 +1,11 @@
 """The Shared Data Interface"""
-from shared.document import Document
+from shared.document import Document, create, write, readonly, autosave
 from shared.dossier import Dossier
 from shared.database import Database
+from shared.constant import DEFAULT_DIRECTORY
+from jesth.util import get_key_value
 
 
-__all__ = ["Document", "Dossier", "Database"]
+__all__ = ["Document", "Dossier", "Database",
+           "create", "readonly", "write", "autosave",
+           "get_key_value", "DEFAULT_DIRECTORY"]

shared/__main__.py

@@ -67,8 +67,8 @@
     
     Update the content of an entry
     ==============================
-    set <entry-name> <type>
-    set <entry-name> <type> <new-content-filename>
+    set <entry-name> <type>:
+    set <entry-name> <type>: <new-content-filename>
     Valid types: dict list set bin
     
     Delete a specific entry
@@ -126,7 +126,7 @@ def check_handler(*args):
         if not info:
             print(ENTRY_DOESNT_EXIST_NOTE)
             return
-        container, filename = info
+        _, container, filename = info
         size = get_file_size(filename)
         print("'{}' {} {}".format(entry, container, size))
     else:
@@ -135,7 +135,7 @@ def check_handler(*args):
             print(EMPTY_DOSSIER_NOTE)
             return
         for entry in sorted(info):
-            container, filename = info[entry]
+            _, container, filename = info[entry]
             size = get_file_size(filename)
             print("- '{}' {} {}".format(entry, container, size))
 
@@ -159,7 +159,7 @@ def get_handler(*args):
     if not info:
         print(ENTRY_DOESNT_EXIST_NOTE)
         return
-    container, filename = info
+    _, container, filename = info
     if container == "bin":
         if not os.path.exists(filename):
             print("Missing binary file '{}'".format(filename))
@@ -186,9 +186,11 @@ def set_handler(*args):
     # update entry with default value accordingly to its container type
     if len(args) == 2:
         entry, container = args
+        container = container.rstrip(":")
         update_entry_with_default_data(dossier, entry, container)
     else:
         entry, container, source_filename = args
+        container = container.rstrip(":")
         update_entry_content(dossier, entry, container, source_filename)
 
 
@@ -214,6 +216,7 @@ def update_entry_content(dossier, entry, container,
     if not os.path.exists(source_filename):
         print("Non existent filename '{}'.".format(source_filename))
         return
+    container = container.rstrip(":")
     if container not in ("bin", "dict", "list", "set"):
         print("Unknown container type '{}'.".format(container))
         return

shared/constant/__init__.py

@@ -3,6 +3,3 @@
 
 DEFAULT_DIRECTORY = os.path.join(os.path.expanduser("~"),
                                 "PyrusticHome", "shared")
-
-
-VALID_DOCUMENT_FILE_FORMATS = ("auto", "json", "hackernote")

shared/database/__init__.py

@@ -6,6 +6,7 @@
 import sqlite3 as sqlite
 from shared.constant import DEFAULT_DIRECTORY
 from shared import error
+from shared import dto
 
 
 class Database:
@@ -173,11 +174,13 @@ def query(self, sql, param=None):
         """
         Use this method to query your database.
         Formally: Data Query Language (DQL)
-        It returns a tuple: (data, description).
-                Data is a list with data from ur query.
-                Description is a list with the name of columns related to data
-            Example: ( [1, "Jack", 50], ["id", "name", "age"] )
-            This method can raise sqlite.Error, sqlite.Warning
+        It returns a namedtuple: (columns, data).
+        Columns is a list of strings, columns names.
+        Data is a list with data from ur query.
+            Example:
+                namedtuple(columns=["id", "name", "age"],
+                        data= ( [1, "Jack", 50], ...) )
+        This method can raise sqlite.Error, sqlite.Warning
         """
         if self._deleted:
             raise error.AlreadyDeletedError
@@ -200,7 +203,8 @@ def query(self, sql, param=None):
             finally:
                 if cur:
                     cur.close()
-            return [x[0] for x in description], data
+            columns = [x[0] for x in description]
+            return dto.QueryResult(columns, data)
 
     def script(self, script):
         """
@@ -279,14 +283,13 @@ def get_tables(self):
 
     def get_columns(self, table):
         """
-        Returns the list of columns names of the given table name
-        A column is like:
-            (int_id, str_column_name, str_column_datatype, int_boolean_nullability,
-            default_value, int_primary_key)
+        Returns information about the columns of a given table
+        A column is a namedtuple:
+            namedtuple(index, name, type, not_null, default, primary_key)
         Example:
-            [(0, "id", "INTEGER", 1, None, 1),
-            (1, "name", "TEXT", 0, None, 0),
-            (2, "age", "INTEGER", 1, None, 0)]
+            [namedtuple(0, "id", "INTEGER", 1, None, 1),
+            namedtuple(1, "name", "TEXT", 0, None, 0),
+            namedtuple(2, "age", "INTEGER", 1, None, 0)]
 
         This method can raise sqlite.Error, sqlite.Warning
         """
@@ -298,7 +301,7 @@ def get_columns(self, table):
             try:
                 cur = self._connection.cursor()
                 cur.execute("pragma table_info('{}')".format(table))
-                data = cur.fetchall()
+                cache = cur.fetchall()
             except sqlite.Error as e:
                 if self._raise_exception:
                     raise
@@ -308,6 +311,9 @@ def get_columns(self, table):
             finally:
                 if cur:
                     cur.close()
+            for item in cache:
+                info = dto.ColumnInfo(*item)
+                data.append(info)
             return data
 
     def close(self):