rbeesoft 2.0.4__py3-none-any.whl → 2.0.6__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. rbeesoft/app/main.py +4 -4
  2. rbeesoft/app/ui/__init__.py +2 -0
  3. rbeesoft/app/ui/processes/__init__.py +2 -0
  4. rbeesoft/app/ui/rbeesoftmainwindow.py +7 -7
  5. rbeesoft/app/ui/widgets/__init__.py +2 -0
  6. rbeesoft/app/ui/widgets/pages/__init__.py +2 -0
  7. rbeesoft/common/__init__.py +3 -0
  8. rbeesoft/common/exceptions/__init__.py +1 -0
  9. rbeesoft/common/licensemanager.py +3 -1
  10. {rbeesoft-2.0.4.dist-info → rbeesoft-2.0.6.dist-info}/METADATA +1 -1
  11. {rbeesoft-2.0.4.dist-info → rbeesoft-2.0.6.dist-info}/RECORD +13 -12
  12. /rbeesoft/common/{licenseexception.py → exceptions/licenseexception.py} +0 -0
  13. {rbeesoft-2.0.4.dist-info → rbeesoft-2.0.6.dist-info}/WHEEL +0 -0
rbeesoft/app/main.py CHANGED
@@ -1,9 +1,9 @@
1
1
  import sys
2
2
  from PySide6 import QtWidgets, QtCore
3
- from rbeesoft.app.ui.rbeesoftmainwindow import RbeesoftMainWindow
4
- from rbeesoft.app.ui.widgets.pages.page import Page
5
- from rbeesoft.app.ui.processes.process import Process
6
- from rbeesoft.app.ui.processes.processrunner import ProcessRunner
3
+ from rbeesoft.app.ui import RbeesoftMainWindow
4
+ from rbeesoft.app.ui.widgets.pages import Page
5
+ from rbeesoft.app.ui.processes import Process
6
+ from rbeesoft.app.ui.processes import ProcessRunner
7
7
 
8
8
 
9
9
  class MainWindow(RbeesoftMainWindow):
rbeesoft/app/ui/__init__.py CHANGED
@@ -0,0 +1,2 @@
1
+ from rbeesoft.app.ui.settings import Settings
2
+ from rbeesoft.app.ui.rbeesoftmainwindow import RbeesoftMainWindow
rbeesoft/app/ui/processes/__init__.py CHANGED
@@ -0,0 +1,2 @@
1
+ from rbeesoft.app.ui.processes.process import Process
2
+ from rbeesoft.app.ui.processes.processrunner import ProcessRunner
rbeesoft/app/ui/rbeesoftmainwindow.py CHANGED
@@ -3,11 +3,11 @@ from PySide6.QtCore import Qt, QByteArray
3
3
  from PySide6.QtWidgets import QMainWindow, QStyle, QFileDialog
4
4
  from PySide6.QtGui import QGuiApplication, QAction
5
5
  from rbeesoft.app.ui.settings import Settings
6
- from rbeesoft.app.ui.widgets.centraldockwidget import CentralDockWidget
7
- from rbeesoft.app.ui.widgets.logdockwidget import LogDockWidget
8
- from rbeesoft.common.licensemanager import LicenseManager
9
- from rbeesoft.common.licenseexception import LicenseException
10
- from rbeesoft.common.logmanager import LogManager
6
+ from rbeesoft.app.ui.widgets import CentralDockWidget
7
+ from rbeesoft.app.ui.widgets import LogDockWidget
8
+ from rbeesoft.common import LicenseManager
9
+ from rbeesoft.common.exceptions import LicenseException
10
+ from rbeesoft.common import LogManager
11
11
 
12
12
  LOG = LogManager()
13
13
 
@@ -121,9 +121,9 @@ class RbeesoftMainWindow(QMainWindow):
121
121
  LOG.info('License OK')
122
122
  return True
123
123
  except LicenseException as e:
124
- LOG.error(e)
124
+ LOG.info(e)
125
125
  return False
126
- LOG.warning('No license found')
126
+ LOG.info('No license found')
127
127
  return False
128
128
 
129
129
  def load_geometry_and_state(self):
rbeesoft/app/ui/widgets/__init__.py CHANGED
@@ -0,0 +1,2 @@
1
+ from rbeesoft.app.ui.widgets.centraldockwidget import CentralDockWidget
2
+ from rbeesoft.app.ui.widgets.logdockwidget import LogDockWidget
rbeesoft/app/ui/widgets/pages/__init__.py CHANGED
@@ -0,0 +1,2 @@
1
+ from rbeesoft.app.ui.widgets.pages.page import Page
2
+ from rbeesoft.app.ui.widgets.pages.pagerouter import PageRouter
rbeesoft/common/__init__.py CHANGED
@@ -0,0 +1,3 @@
1
+ from rbeesoft.common.logmanager import LogManager
2
+ from rbeesoft.common.logmanagerlistener import LogManagerListener
3
+ from rbeesoft.common.licensemanager import LicenseManager
rbeesoft/common/exceptions/__init__.py ADDED
@@ -0,0 +1 @@
1
+ from rbeesoft.common.exceptions.licenseexception import LicenseException
rbeesoft/common/licensemanager.py CHANGED
@@ -3,7 +3,7 @@ import time
3
3
  import base64
4
4
  from pathlib import Path
5
5
  from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PublicKey
6
- from rbeesoft.common.licenseexception import LicenseException
6
+ from rbeesoft.common.exceptions.licenseexception import LicenseException
7
7
 
8
8
 
9
9
  class LicenseManager:
@@ -28,6 +28,8 @@ class LicenseManager:
28
28
  def verify(self, file_path):
29
29
  if isinstance(file_path, str):
30
30
  file_path = Path(file_path)
31
+ if not file_path.exists():
32
+ raise LicenseException('No license found')
31
33
  try:
32
34
  signed = json.loads(file_path.read_text(encoding='utf-8'))
33
35
  payload = signed['payload']
{rbeesoft-2.0.4.dist-info → rbeesoft-2.0.6.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rbeesoft
3
- Version: 2.0.4
3
+ Version: 2.0.6
4
4
  Summary:
5
5
  Author: Brecheisen
6
6
  Author-email: r.brecheisen@maastrichtuniversity.nl
{rbeesoft-2.0.4.dist-info → rbeesoft-2.0.6.dist-info}/RECORD RENAMED
@@ -3,28 +3,29 @@ rbeesoft/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
3
  rbeesoft/app/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
4
4
  rbeesoft/app/generatekeys.py,sha256=YVxIhKhyo0JY6HFxCTNZdD5bU_K6Vb1zkRKdsYQ80Ew,1243
5
5
  rbeesoft/app/license.json,sha256=m8ukgKJdiJ3fU4nsFIrE2fm6Qk_SdIdwoqkapM2MnlI,374
6
- rbeesoft/app/main.py,sha256=AsDayu8MZoLnd9ODZmHL-AA-dqS8exodKv4LcHKw44o,2886
6
+ rbeesoft/app/main.py,sha256=zg0Jk8o2WbECudn7LKJ09-yTAMHQQaFFelm2-8PFXOA,2840
7
7
  rbeesoft/app/signlicense.py,sha256=Zp5bZOnmtHsFOACgU3iGRwy0Ko0nb4GZ97lB4BKTWMw,2704
8
- rbeesoft/app/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
- rbeesoft/app/ui/processes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
8
+ rbeesoft/app/ui/__init__.py,sha256=uDSH_teO12m1hKSf_6ukPnUxIwHg_cvs3ld0UGngTd4,112
9
+ rbeesoft/app/ui/processes/__init__.py,sha256=r08tBoeRxfyMDyuJcUxljGXdxR00yyQRyxHuLp8H1lI,120
10
10
  rbeesoft/app/ui/processes/dummyprocess.py,sha256=4r97xwHv7ZaoK85zBxR00zzYnYpoFAxZfBPmxFJYDkM,470
11
11
  rbeesoft/app/ui/processes/process.py,sha256=qMrXKvT06oRe1yRSe3DLO9ObhV2qzzZLI5R-PwryOYs,1694
12
12
  rbeesoft/app/ui/processes/processrunner.py,sha256=HqDQ3ZMlqCqQkyuEgV5sJCkzD35ENvp58z9D-TtnVdA,1170
13
- rbeesoft/app/ui/rbeesoftmainwindow.py,sha256=p-tO7YG39DEQ_15ijLGKSG1MFWnPBWR8CGR7nl971jA,5713
13
+ rbeesoft/app/ui/rbeesoftmainwindow.py,sha256=levhSXKlNxjY-zjdiNpcRF4MM5AHcIz27tH3eQyFJF0,5645
14
14
  rbeesoft/app/ui/settings.py,sha256=JeUBdQgah9s2XbSqsgEEYzFN2yvUwFMk8L7KFsa55WM,2200
15
- rbeesoft/app/ui/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
15
+ rbeesoft/app/ui/widgets/__init__.py,sha256=PI6L1-6X9UBEQqiGbZard5Gde2ik7uQTyBATgZ6dvq4,136
16
16
  rbeesoft/app/ui/widgets/centraldockwidget.py,sha256=kK0x-Sz4yz7D4icaIepWpAtct7ZQ9BNroi9EccAvABA,1376
17
17
  rbeesoft/app/ui/widgets/logdockwidget.py,sha256=DZkQQitarE5B82qvNCSnUWDWXxhWsuTauboULFoh7eI,1810
18
- rbeesoft/app/ui/widgets/pages/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
18
+ rbeesoft/app/ui/widgets/pages/__init__.py,sha256=RfblhaIaT8rGBK6ZCtAw6MOqJ6gQJcWwkj13GOtDlok,116
19
19
  rbeesoft/app/ui/widgets/pages/page.py,sha256=huzUrbvyx8qZmeelKRhLimB9RFfuj9bK_EsG_56AK_E,661
20
20
  rbeesoft/app/ui/widgets/pages/pagerouter.py,sha256=L5EKEMWVibSI7IpabQBkLsCDw1xBt1wfYY50iR56VZA,1460
21
- rbeesoft/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
22
- rbeesoft/common/licenseexception.py,sha256=oapxaf0e9Fbl3iAa5e3c2EYxNhD0e1im1mwJfimsZ3Q,44
23
- rbeesoft/common/licensemanager.py,sha256=UxsEvWbzXHTAI5sqI-MsZZP-aG1GK14YBY_ky2M5JyE,1554
21
+ rbeesoft/common/__init__.py,sha256=yVKzi7bWHNm7jabb6ah3yz10H-xDLBA5ilsvgYXXD-4,175
22
+ rbeesoft/common/exceptions/__init__.py,sha256=6JA5DLQE467BorgSuAwB2jICgt6YJju40QJjGiIk_aY,72
23
+ rbeesoft/common/exceptions/licenseexception.py,sha256=oapxaf0e9Fbl3iAa5e3c2EYxNhD0e1im1mwJfimsZ3Q,44
24
+ rbeesoft/common/licensemanager.py,sha256=jBzGrsIUE_a9k1Eam95qtS9qP-CcH89-bzdzAbY5Fwg,1657
24
25
  rbeesoft/common/logmanager.py,sha256=K_qCbPjrzoV5le3KSvLOSSXYa-_MWLJ3FdFNTEGYSxg,1391
25
26
  rbeesoft/common/logmanagerlistener.py,sha256=Gaig07yjBnyQq9I8sN85olTEeDCDyCFQnEJdwzvmgvc,99
26
27
  rbeesoft/common/singleton.py,sha256=FV0k_LlOCmFhlWN6gf1c2x7YXWyd8-7DsIMvOKrI6NY,224
27
28
  rbeesoft/webapp/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
28
- rbeesoft-2.0.4.dist-info/METADATA,sha256=5JpIKhEMZamX4jm6keezUXIph6r5mfHTzOAp8jt7RDw,378
29
- rbeesoft-2.0.4.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
30
- rbeesoft-2.0.4.dist-info/RECORD,,
29
+ rbeesoft-2.0.6.dist-info/METADATA,sha256=dx7ojoELslK6cwn_pcdRnJGaVuXA9KgKp4SxHM_7qnY,378
30
+ rbeesoft-2.0.6.dist-info/WHEEL,sha256=3ny-bZhpXrU6vSQ1UPG34FoxZBp3lVcvK0LkgUz6VLk,88
31
+ rbeesoft-2.0.6.dist-info/RECORD,,