From 3552f3c049b3df4501a58bf5dd094c52729f5124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=88=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=82=D0=BE=D0=BA=D0=B8?=
 =?UTF-8?q?=D1=9B-=D0=A8=D1=83=D0=BC=D0=B0=D1=80=D0=B0=D1=86?=
 <sumarac@protonmail.com>
Date: Sun, 4 Feb 2024 02:44:48 +0100
Subject: [PATCH] add database handling using shelve

---
 app/__pycache__/database.cpython-312.pyc | Bin 0 -> 2490 bytes
 app/__pycache__/utils.cpython-312.pyc    | Bin 0 -> 345 bytes
 app/app.py                               |  60 ++++++++++++++
 app/database.py                          |  52 ++++++++++++
 app/utils.py                             |   5 ++
 requirements.txt                         |   4 +-
 spyglass.py                              | 100 -----------------------
 7 files changed, 120 insertions(+), 101 deletions(-)
 create mode 100644 app/__pycache__/database.cpython-312.pyc
 create mode 100644 app/__pycache__/utils.cpython-312.pyc
 create mode 100755 app/app.py
 create mode 100755 app/database.py
 create mode 100644 app/utils.py
 delete mode 100755 spyglass.py

diff --git a/app/__pycache__/database.cpython-312.pyc b/app/__pycache__/database.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..89b25ba56bf2607374b0b95dc593bf86865cd990
GIT binary patch
literal 2490
zcmbVOO=ufO6rTOluKsLeE4E_%qlP4w9Iz5faG;?<;MQ(&<j@34M9Ly-$FY>vPiIzk
zWMq<pDK<Dn&P6so*vEtvnqyC;_g><-A!5=%N^=RlICi0sQ{U`r9Va+B^nu=+H}mH0
z%zNK^qu+u-9|9Wq`xk5~2>rzsm*nPPcMJw~WFSK@QOc1*O0;z;C4m%8Ij^J?fv-uX
zC$FYd0f}f78S(-$l>4INDWz3}nCB%|k}-kF7t+==NXf|JjAP;Ora9U@33?r2loAXC
z9~7`OB^u&_oRSS`0i_h~KIJhKtirqp=Cz6%)0lE`8k<v0o64HFkj~?b>yW$Wx02wu
z+buY^sv@1w+hicnVBR4MBH~ca<Bs0Q`_19JScRiqiy}l$Sem<@v*YS&j?4w$*12Yg
z_nY4{q&d*5g3b4xse-`2Z2OP?5C4km{~*s+t9v5DW2kPP1XMvWEy<MeY@vLe$zv1e
zKbvcb51GYG+KkibG{JGEew{5C#aYVK#DxnZiA#yOwuy_8LeYxQa;a1#7B*h;xI;c<
zo(LuylT0g_X=|!T^2|dk)WUft7Qq89%w$Qiz@)3#B0NDciOCdlNK{amTBN#FDPhX<
z7Kub&55}j9c^s$Ze43;)aRbl9X{mD6Oj8<9mr8LXZKWsE6c3duOw;vjA#3UST#F5h
zAy@Z;Gg<_86E(W~7UgAcqrDS^`l749eq-gvR#$XUeeQ3sU47*5{UhAH?pyP%x2&~n
z%xr~+9-c~Uh7-SzZHC7eM{a%52!>X@kAffVH>+%gPdxyGv)tfCp!H$fk&VRT!0}!9
zB+Bf843s@ceg#S$S$k`_{lMkhfT}3R?cX6o_)&Dz2N33gvZ;zLLNJq;pv=6pBx~Wx
zbmm%2W(u`SL@t(afwX`r;Yf%H<PZqT4-g?;z?oOqalyg_;@9fNuQ|cjX)myw=tX;1
zeQ;%P_0sy~waX8V{@y;!1KDWpSoD*_V3FB>WPT~T0>6hronHv#yY$`ZgXeR5S9`O=
ztwiBHzH)nYe9)c>N4t=WNp=VTca=hhDH*d!aZI-3!8Ck5V<V7x`Di9>mND~MfIT~&
zl-~|;*$f#V4qty8agN>tX7mKGo9MZ}_4e@6@I!xJBhYqxbZPYV_|o`t(pAncoxe4)
zt)M`^9X?(m7Rh3Ia3`CFe7!G@ABq?6T%=ePuRu)arFnT?sR|#mx9vRhD%g2O&^O0m
zmsZuP(u_cbW$oa683ND$K^drOZf6qE@_>x0YSX8;>aEHj^eMjAr}u52&^v`3?;-Dy
zix~J~2%#&0$a&wqzv@5u4prY-*uUH<bEHT~CL38op_h?j4reS1DB;D!JT@*U^FRy2
z1%oM2Zh0CD*cc+mxrx`9bkIWyycdYX_@tmSt$=5B+iQT2T+jSzBus6pOt{8`85)2+
z9BeK*b?PaXpzGnefK#N7b_7i6&%mI?g~IjGmC<@~CAk$ky6FAWA8JHmn}OcNky>;$
z(TK)>YPr|46+N>VIJP)eGdB{?yZU#K7(7{%8XcXh#+`Fb7ptGIOgsq<ZiWW$e*8ET
z-&Vk8TSGljZhfYvHafaDqK`TTUGpzDLjzAjLz|(YyR(l&!>_>p4A>uztOwVEKeX;3
zA=tkn*M!=sMsHtDuB$8Rs&L2mN`iSC{mGb@cX9rb>pJu4dcJ6sO+F6j`nTn@*<6vR
zMMxNKOZqqicp{#vj73hv@E)?A+0i2WIky>qujx@>3us&PD+3!Hy9mTikEDcle6rHB
z9cWYfSB-xV2*&~68}pKO5b%mY8=b*~S2k(mGinL`)R@^x!uu3c%2w8-_LJs(^Am2!
x(QBXMwRYCI%ctZV%<;BM`PsK6K@grI?^D$I6tzA>;b-X3zn(z>5(3QL{~y^v1pWX3

literal 0
HcmV?d00001

diff --git a/app/__pycache__/utils.cpython-312.pyc b/app/__pycache__/utils.cpython-312.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b6b21019cbd4fbeea18b24d5cb9bc73783acb786
GIT binary patch
literal 345
zcmYLDJx;?g82$W%ND&nb9T+Pype&dJpdO$D3maP$n>JEHEZadu>cCK>+yJhCxC0m9
z239vN5GhQZ_#7qbll<QMexB{0>GT8;%zvu|>Tf7U@WFI5H18lmfg}nZxujeEKx!6q
z&kDQpJT0Y4>6k-h!|87Ns3YTS17CwD;KEjq4LNjch{;_{{gF1=lk;4?WG<#A+-^d^
z1~;GYuf)16l(1Eim?RZaJqxSrRi0QY60Jq$vfN(l+B2Cc6JaO>?K#pb?D(X)+%9)K
zYG!ZC4to&ZWY(E}^%Kkld*&EvAKezEta7z5r&xyX+Y6+Y5kgu{$ysyX0?G&b3(_b5
E0kZl<Hvj+t

literal 0
HcmV?d00001

diff --git a/app/app.py b/app/app.py
new file mode 100755
index 0000000..31b029b
--- /dev/null
+++ b/app/app.py
@@ -0,0 +1,60 @@
+import os
+import typer
+
+from pathlib import Path
+from database import Shelf
+from utils import die
+
+
+
+app = typer.Typer()
+project_subcommand = typer.Typer()
+app.add_typer(project_subcommand, name='project')
+
+entries: dict = {
+    'dirs': [],
+    'projects': [],
+    'config': {}
+}
+
+
+
+@project_subcommand.command('add')
+def project_add(path: Path, name: str = None, runner: str = None, editor: str = 'code', multi: bool = False):
+
+    global entries
+
+    if multi:
+        die('Cannot specify name for a dir', 2) if name else None
+
+        for dir in os.listdir(path):
+            entries['dirs'].append(create_entry(path/dir, name, runner, editor))
+
+    else:
+        entries['projects'].append(create_entry(path, name, runner, editor))
+
+    with Shelf('spyglass') as shelf:
+        shelf.update(entries)
+
+
+
+def create_entry(path: Path, name: str, runner: str, editor: str):
+    if not name:
+        name = os.path.dirname(path)
+
+    if not runner:
+        runner = None
+
+    if not editor:
+        editor = None
+
+    return {name: {'path': str(path.resolve()), 'runner': str(path/runner) if runner else None, 'editor': editor}}
+
+
+
+def main():
+    app()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/app/database.py b/app/database.py
new file mode 100755
index 0000000..47dc28a
--- /dev/null
+++ b/app/database.py
@@ -0,0 +1,52 @@
+import os
+import shelve as shelf
+import platform
+from pathlib import Path
+from utils import die
+
+
+class Shelf:
+    def __init__(self, filename: str):
+        self.file: Path = None
+        self.db = None
+
+        os_type: str = platform.system()
+
+        if os_type == 'Linux':
+            self.file = os.environ.get('HOME') + '/.local/share/' + filename
+        elif os_type == 'Windows':
+            self.file = os.environ.get('APPDATA') + filename
+        else:
+            die('OS not supported', 2)
+
+
+    def __enter__(self):
+        # Open the shelf and load data into self.db
+        self.db = shelf.open(self.file, writeback=True)
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        # Save any updates to the shelf
+        if self.db is not None:
+            self.db.sync()
+            self.db.close()
+
+    def update(self, entries: dict):
+        db_values = self.db.values()
+
+        if db_values:
+            dirs, projects, _ = db_values
+            new_dirs, new_projects, _ = entries.values()
+
+            for dir in new_dirs:
+                if dir not in dirs:
+                    self.db['dirs'].append(dir)
+
+            for project in new_projects:
+                if project not in projects:
+                    self.db['projects'].append(project)
+        else:
+            for k, v in entries.items():
+                self.db[k] = v
+
+
diff --git a/app/utils.py b/app/utils.py
new file mode 100644
index 0000000..e3ac1ed
--- /dev/null
+++ b/app/utils.py
@@ -0,0 +1,5 @@
+
+def die(msg: str, code: str):
+    print(msg)
+    exit(code)
+
diff --git a/requirements.txt b/requirements.txt
index 0e56538..466178a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,4 @@
 typer[all]
-pyYAML
+attrs >= 23.2.0
+shelve2 >= 1.0
+pyYAML >= 6.0.1
diff --git a/spyglass.py b/spyglass.py
deleted file mode 100755
index 93ccabe..0000000
--- a/spyglass.py
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/python
-
-import os
-import yaml
-import platform
-from pathlib import Path
-# from rich import print
-
-import typer
-
-
-app = typer.Typer()
-project_subcommand = typer.Typer()
-app.add_typer(project_subcommand, name='project')
-
-entries: list = []
-
-
-@project_subcommand.command('add')
-def project_add(path: Path, name: str = None, runner: str = None, editor: str = 'code', multi: bool = False):
-
-    global entries
-
-    if multi:
-        if name:
-            print('\n[bold red]Cannot name multiple projects the same.\n')
-            exit(69)
-
-        for dir in os.listdir(path):
-            print(dir)
-            entries.append(assamble_entry(path/dir, name, runner, editor))
-    else:
-        entries.append(assamble_entry(path, name, runner, editor))
-
-    for project in entries:
-        store_project(project)
-
-
-
-
-
-def get_database_path():
-    database: str = None
-    os_type: str = platform.system()
-
-    if os_type == 'Linux':
-        database = os.environ.get('HOME') + '/.local/share/spyglass-db.yaml'
-    elif os_type == 'Windows':
-        database = os.environ.get('APPDATA') + 'spyglass-db.yaml'
-    else:
-        print('OS not supported')
-        exit(69)
-
-    return database
-
-
-
-def store_project(project: dict):
-    database: str = get_database_path()
-
-    if not os.path.exists(database):
-        with open(database, 'w') as f:
-            f.write('projects:')
-    data = None
-    with open(database, 'r') as f:
-        data = yaml.safe_load(f)
-
-    project_list: list = [proj for proj in data['projects'] if os.path.isdir(proj)]
-
-    print(project_list)
-
-    if project not in project_list:
-        project_list.append(project)
-    else:
-        print('Project already exists')
-
-    with open(database, 'w') as f:
-        yaml.safe_dump(data, f)
-
-
-def assamble_entry(path: Path, name: str, runner: str, editor: str):
-    if not name:
-        name = os.path.dirname(path)
-
-    if not runner:
-        runner = 'None'
-
-    if not editor:
-        editor = 'code'
-
-    return {name: {'path': str(path), 'runner': str(path/runner), 'editor': editor}}
-
-
-
-def main():
-    app()
-
-
-if __name__ == '__main__':
-    main()