rbeesoft 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

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/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,12 +117,13 @@ 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:
-                LOG.error(e)
+                LOG.info(e)
                 return False
-        LOG.warning('No license found')
+        LOG.info('No license found')
         return False
 
     def load_geometry_and_state(self):

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)

rbeesoft/common/licensemanager.py

@@ -28,6 +28,8 @@ class LicenseManager:
     def verify(self, file_path):
         if isinstance(file_path, str):
             file_path = Path(file_path)
+        if not file_path.exists():
+            raise LicenseException('No license found')
         try:
             signed = json.loads(file_path.read_text(encoding='utf-8'))
             payload = signed['payload']

{rbeesoft-2.0.3.dist-info → rbeesoft-2.0.5.dist-info}/METADATA

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

{rbeesoft-2.0.3.dist-info → rbeesoft-2.0.5.dist-info}/RECORD

@@ -4,27 +4,27 @@ rbeesoft/app/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 rbeesoft/app/generatekeys.py,sha256=YVxIhKhyo0JY6HFxCTNZdD5bU_K6Vb1zkRKdsYQ80Ew,1243
 rbeesoft/app/license.json,sha256=m8ukgKJdiJ3fU4nsFIrE2fm6Qk_SdIdwoqkapM2MnlI,374
 rbeesoft/app/main.py,sha256=AsDayu8MZoLnd9ODZmHL-AA-dqS8exodKv4LcHKw44o,2886
-rbeesoft/app/signlicense.py,sha256=9dQG4TNUdTmXTNhzQLghLn59fE_yx1BKYEwvKVAUj_w,2122
+rbeesoft/app/signlicense.py,sha256=Zp5bZOnmtHsFOACgU3iGRwy0Ko0nb4GZ97lB4BKTWMw,2704
 rbeesoft/app/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbeesoft/app/ui/processes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbeesoft/app/ui/processes/dummyprocess.py,sha256=4r97xwHv7ZaoK85zBxR00zzYnYpoFAxZfBPmxFJYDkM,470
 rbeesoft/app/ui/processes/process.py,sha256=qMrXKvT06oRe1yRSe3DLO9ObhV2qzzZLI5R-PwryOYs,1694
 rbeesoft/app/ui/processes/processrunner.py,sha256=HqDQ3ZMlqCqQkyuEgV5sJCkzD35ENvp58z9D-TtnVdA,1170
-rbeesoft/app/ui/rbeesoftmainwindow.py,sha256=F-oUd4gOJ6GepTP4Ysu1bN8NqvTJ3HmVqIuwcrH9mvc,5654
+rbeesoft/app/ui/rbeesoftmainwindow.py,sha256=Fjy5m5cMzEbs4J_tVphJT7OzBFn32MWppDBOnlcFN1Y,5709
 rbeesoft/app/ui/settings.py,sha256=JeUBdQgah9s2XbSqsgEEYzFN2yvUwFMk8L7KFsa55WM,2200
 rbeesoft/app/ui/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbeesoft/app/ui/widgets/centraldockwidget.py,sha256=kK0x-Sz4yz7D4icaIepWpAtct7ZQ9BNroi9EccAvABA,1376
 rbeesoft/app/ui/widgets/logdockwidget.py,sha256=DZkQQitarE5B82qvNCSnUWDWXxhWsuTauboULFoh7eI,1810
 rbeesoft/app/ui/widgets/pages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbeesoft/app/ui/widgets/pages/page.py,sha256=_YI8y-VP3MLz4C6xChIJhrDwZ2QbcQBY2g7zvAI8r4M,554
+rbeesoft/app/ui/widgets/pages/page.py,sha256=huzUrbvyx8qZmeelKRhLimB9RFfuj9bK_EsG_56AK_E,661
 rbeesoft/app/ui/widgets/pages/pagerouter.py,sha256=L5EKEMWVibSI7IpabQBkLsCDw1xBt1wfYY50iR56VZA,1460
 rbeesoft/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rbeesoft/common/licenseexception.py,sha256=oapxaf0e9Fbl3iAa5e3c2EYxNhD0e1im1mwJfimsZ3Q,44
-rbeesoft/common/licensemanager.py,sha256=UxsEvWbzXHTAI5sqI-MsZZP-aG1GK14YBY_ky2M5JyE,1554
+rbeesoft/common/licensemanager.py,sha256=K-F9fpnBXOG-tjfhO5YAK706gXDk623ZtYQVi12-4Iw,1646
 rbeesoft/common/logmanager.py,sha256=K_qCbPjrzoV5le3KSvLOSSXYa-_MWLJ3FdFNTEGYSxg,1391
 rbeesoft/common/logmanagerlistener.py,sha256=Gaig07yjBnyQq9I8sN85olTEeDCDyCFQnEJdwzvmgvc,99
 rbeesoft/common/singleton.py,sha256=FV0k_LlOCmFhlWN6gf1c2x7YXWyd8-7DsIMvOKrI6NY,224
 rbeesoft/webapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rbeesoft-2.0.3.dist-info/METADATA,sha256=_60oXjgLbPCAIMrQOamK4sL-OHQj_7hQrxQ9a0t8spc,378
-rbeesoft-2.0.3.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
-rbeesoft-2.0.3.dist-info/RECORD,,
+rbeesoft-2.0.5.dist-info/METADATA,sha256=MLufddI91YLdHBYByzCtZgb7ZpzKZv0rJqU4Ye6Ymlw,378
+rbeesoft-2.0.5.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
+rbeesoft-2.0.5.dist-info/RECORD,,