ensec-cli 2.1.0__tar.gz → 2.2.0__tar.gz

{ensec_cli-2.1.0 → ensec_cli-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 2.1.0
+Version: 2.2.0
 Summary: EncryptSecureDEC Open Source CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

ensec_cli-2.2.0/ensec_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.2.0"

{ensec_cli-2.1.0 → ensec_cli-2.2.0}/ensec_cli/utils.py

@@ -5,20 +5,24 @@ from Crypto.PublicKey import RSA
 #import tkinter as tk
 #from tkinter import ttk, messagebox
 
-def _default_app_dir() -> str:
-    base = os.getenv("APPDATA") or os.path.expanduser("~")
-    folder = os.path.join(base, "EncryptSecureDEC")
-    os.makedirs(folder, exist_ok=True)
-    return folder
+from pathlib import Path
+import os
+import hashlib
+from Crypto.PublicKey import RSA
+
+APP_NAME = "ENSEC"
+
+def _home_for_xdg():
+    return Path.home()
 
-default_keys=_default_app_dir()+"\\key"
+HOME = _home_for_xdg()
+XDG_DATA_HOME = Path(os.getenv("XDG_DATA_HOME", HOME / ".local" / "share"))
+DATA_DIR = XDG_DATA_HOME / APP_NAME
 
 def _trusted_dir() -> str:
-    # default_keys = ".../EncryptSecureDEC/Key" を想定
-    app_dir = os.path.dirname(default_keys)     # ".../EncryptSecureDEC"
-    d = os.path.join(app_dir, "TrustedKeys")
-    os.makedirs(d, exist_ok=True)
-    return d
+    d = DATA_DIR / "TrustedKeys"
+    d.mkdir(parents=True, exist_ok=True)
+    return str(d)
 
 def _sha256_fp(pem_bytes: bytes) -> str:
     h = hashlib.sha256(pem_bytes).hexdigest()

{ensec_cli-2.1.0 → ensec_cli-2.2.0}/ensec_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 2.1.0
+Version: 2.2.0
 Summary: EncryptSecureDEC Open Source CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{ensec_cli-2.1.0 → ensec_cli-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ensec-cli"
-version = "2.1.0"
+version = "2.2.0"
 description = "EncryptSecureDEC Open Source CLI"
 requires-python = ">=3.9"
 readme = "README.md"

ensec_cli-2.1.0/ensec_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "2.1.0"