rbeesoft 2.0.3__tar.gz → 2.0.4__tar.gz

{rbeesoft-2.0.3 → rbeesoft-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbeesoft
-Version: 2.0.3
+Version: 2.0.4
 Summary: 
 Author: Brecheisen
 Author-email: r.brecheisen@maastrichtuniversity.nl

{rbeesoft-2.0.3 → rbeesoft-2.0.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "rbeesoft"
-version = "2.0.3"
+version = "2.0.4"
 description = ""
 authors = [
     {name = "Brecheisen", email = "r.brecheisen@maastrichtuniversity.nl"}

{rbeesoft-2.0.3 → rbeesoft-2.0.4}/src/rbeesoft/app/signlicense.py

@@ -1,4 +1,5 @@
 import base64
+import argparse
 import json
 import time
 from pathlib import Path
@@ -49,19 +50,23 @@ def sign_license(payload: dict, priv: Ed25519PrivateKey) -> dict:
     }
 
 def main():
-    priv_path = Path.home() / 'keys/ed25519_private.key'
-    out_path = Path("license.json")
-
+    parser = argparse.ArgumentParser()
+    parser.add_argument('private_key_path', help='Path to private key file')
+    parser.add_argument('output_dir', help='Path to output directory where license.json is written')
+    parser.add_argument('product', help='Name of product')
+    parser.add_argument('expires_days_from_now', help='Number of days to expire', type=int)
+    parser.add_argument('--features', help='Feature list', default='')
+    args = parser.parse_args()
+    priv_path = Path(args.private_key_path) # Path.home() / 'keys/ed25519_private.key'
+    out_path = Path(args.output_dir) / 'license.json'
     priv = load_private_key(priv_path)
-
     payload = make_license_payload(
-        customer="Ralph Example",
-        product="MyPySideApp Pro",
-        expires_days_from_now=30,
-        features=["pro", "export_pdf"],
+        customer='Default customer',
+        product=args.product,
+        expires_days_from_now=args.expires_days_from_now,
+        features=[x.strip() for x in args.features.split(',')],
         machine_fp=None,  # set to a fingerprint to bind to a device
     )
-
     signed = sign_license(payload, priv)
     out_path.write_text(json.dumps(signed, indent=2, ensure_ascii=False), encoding="utf-8")
     print(f"Wrote signed license to: {out_path.resolve()}")

{rbeesoft-2.0.3 → rbeesoft-2.0.4}/src/rbeesoft/app/ui/rbeesoftmainwindow.py

@@ -35,13 +35,13 @@ class RbeesoftMainWindow(QMainWindow):
         self.setWindowTitle(self.app_title())
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.central_dockwidget())
         self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea, self.log_dockwidget())
+        LOG.info(f'Settings path: {self.settings().fileName()}')
         if self.app_icon():
             self.setWindowIcon(self.app_icon())
         self.load_geometry_and_state()
         self.init_default_menus()
         self.check_license()
         self.statusBar().showMessage('Ready')
-        LOG.info(f'Settings path: {self.settings().fileName()}')
 
     def init_default_menus(self):
         # Application menu
@@ -117,6 +117,7 @@ class RbeesoftMainWindow(QMainWindow):
         if file_path:
             try:
                 self._license = self.license_manager().verify(file_path)
+                LOG.info(f'License found at {file_path}')
                 LOG.info('License OK')
                 return True
             except LicenseException as e:

{rbeesoft-2.0.3 → rbeesoft-2.0.4}/src/rbeesoft/app/ui/widgets/pages/page.py

@@ -5,11 +5,12 @@ from PySide6.QtWidgets import QWidget
 class Page(QWidget):
     page_changed = Signal(str)
 
-    def __init__(self, name, title, settings):
+    def __init__(self, name, title, settings, license=None):
         super(Page, self).__init__()
         self._name = name
         self._title = title
         self._settings = settings
+        self._license = license
 
     def name(self):
         return self._name
@@ -20,5 +21,8 @@ class Page(QWidget):
     def settings(self):
         return self._settings
     
+    def license(self):
+        return self._license
+    
     def switch_to_page(self, name):
         self.page_changed.emit(name)