ike

build/mqtt_srv/Analysis-00.toc

@@ -1,5 +1,5 @@
-(['X:\\__GITLAB\\python\\mqtt_srv.pyw'],
+(['\\\\wsl$\\Debian\\home\\jd\\projects\\python\\mqtt_srv.pyw'],
- ['X:\\__GITLAB\\python'],
+ ['\\\\wsl$\\Debian\\home\\jd\\projects\\python'],
  ['codecs'],
  ['C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\stdhooks',
   'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\stdhooks\\__pycache__',
@@ -25,7 +25,7 @@
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
    'PYSOURCE'),
   ('mqtt_srv',
-   '\\\\192.168.77.106\\Data\\__GITLAB\\python\\mqtt_srv.pyw',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\mqtt_srv.pyw',
    'PYSOURCE')],
  [('multiprocessing.popen_spawn_posix',
    'C:\\Program Files\\Python310\\lib\\multiprocessing\\popen_spawn_posix.py',
@@ -309,6 +309,15 @@
   ('multiprocessing',
    'C:\\Program Files\\Python310\\lib\\multiprocessing\\__init__.py',
    'PYMODULE'),
+<<<<<<< HEAD
+=======
+  ('tracemalloc',
+   'C:\\Program Files\\Python310\\lib\\tracemalloc.py',
+   'PYMODULE'),
+  ('stringprep',
+   'C:\\Program Files\\Python310\\lib\\stringprep.py',
+   'PYMODULE'),
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
   ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'),
   ('getpass', 'C:\\Program Files\\Python310\\lib\\getpass.py', 'PYMODULE'),
   ('nturl2path',
@@ -820,7 +829,7 @@
  [],
  [],
  [('base_library.zip',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\base_library.zip',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\base_library.zip',
    'DATA'),
   ('certifi\\py.typed',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\certifi\\py.typed',

build/mqtt_srv/EXE-00.toc

@@ -1,4 +1,4 @@
-('X:\\__GITLAB\\python\\dist\\mqtt_srv.exe',
+('\\\\wsl$\\Debian\\home\\jd\\projects\\python\\dist\\mqtt_srv.exe',
  False,
  False,
  False,
@@ -13,22 +13,24 @@
  None,
  None,
  None,
- 'X:\\__GITLAB\\python\\build\\mqtt_srv\\mqtt_srv.pkg',
+ '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\mqtt_srv.pkg',
- [('PYZ-00.pyz', 'X:\\__GITLAB\\python\\build\\mqtt_srv\\PYZ-00.pyz', 'PYZ'),
+ [('PYZ-00.pyz',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\PYZ-00.pyz',
+   'PYZ'),
   ('struct',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\struct.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\struct.pyc',
    'PYMODULE'),
   ('pyimod01_archive',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod01_archive.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod01_archive.pyc',
    'PYMODULE'),
   ('pyimod02_importers',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod02_importers.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod02_importers.pyc',
    'PYMODULE'),
   ('pyimod03_ctypes',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod03_ctypes.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod03_ctypes.pyc',
    'PYMODULE'),
   ('pyimod04_pywin32',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod04_pywin32.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod04_pywin32.pyc',
    'PYMODULE'),
   ('pyiboot01_bootstrap',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py',
@@ -43,7 +45,7 @@
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
    'PYSOURCE'),
   ('mqtt_srv',
-   '\\\\192.168.77.106\\Data\\__GITLAB\\python\\mqtt_srv.pyw',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\mqtt_srv.pyw',
    'PYSOURCE'),
   ('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'),
   ('VCRUNTIME140.dll',
@@ -99,7 +101,7 @@
    'C:\\Program Files\\Python310\\DLLs\\libffi-7.dll',
    'BINARY'),
   ('base_library.zip',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\base_library.zip',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\base_library.zip',
    'DATA'),
   ('certifi\\py.typed',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\certifi\\py.typed',
@@ -110,7 +112,11 @@
  [],
  False,
  False,
+<<<<<<< HEAD
  1672427170,
+=======
+ 1674797558,
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
  [('runw.exe',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\runw.exe',
    'EXECUTABLE')])

build/mqtt_srv/PKG-00.toc

@@ -1,4 +1,4 @@
-('X:\\__GITLAB\\python\\build\\mqtt_srv\\mqtt_srv.pkg',
+('\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\mqtt_srv.pkg',
  {'BINARY': 1,
   'DATA': 1,
   'EXECUTABLE': 1,
@@ -7,21 +7,23 @@
   'PYSOURCE': 1,
   'PYZ': 0,
   'SPLASH': 1},
- [('PYZ-00.pyz', 'X:\\__GITLAB\\python\\build\\mqtt_srv\\PYZ-00.pyz', 'PYZ'),
+ [('PYZ-00.pyz',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\PYZ-00.pyz',
+   'PYZ'),
   ('struct',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\struct.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\struct.pyc',
    'PYMODULE'),
   ('pyimod01_archive',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod01_archive.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod01_archive.pyc',
    'PYMODULE'),
   ('pyimod02_importers',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod02_importers.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod02_importers.pyc',
    'PYMODULE'),
   ('pyimod03_ctypes',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod03_ctypes.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod03_ctypes.pyc',
    'PYMODULE'),
   ('pyimod04_pywin32',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\localpycs\\pyimod04_pywin32.pyc',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\localpycs\\pyimod04_pywin32.pyc',
    'PYMODULE'),
   ('pyiboot01_bootstrap',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py',
@@ -36,7 +38,7 @@
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py',
    'PYSOURCE'),
   ('mqtt_srv',
-   '\\\\192.168.77.106\\Data\\__GITLAB\\python\\mqtt_srv.pyw',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\mqtt_srv.pyw',
    'PYSOURCE'),
   ('python310.dll', 'C:\\Program Files\\Python310\\python310.dll', 'BINARY'),
   ('VCRUNTIME140.dll',
@@ -92,7 +94,7 @@
    'C:\\Program Files\\Python310\\DLLs\\libffi-7.dll',
    'BINARY'),
   ('base_library.zip',
-   'X:\\__GITLAB\\python\\build\\mqtt_srv\\base_library.zip',
+   '\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\base_library.zip',
    'DATA'),
   ('certifi\\py.typed',
    'C:\\Users\\jaydee\\AppData\\Roaming\\Python\\Python310\\site-packages\\certifi\\py.typed',

build/mqtt_srv/PYZ-00.toc

@@ -1,4 +1,4 @@
-('X:\\__GITLAB\\python\\build\\mqtt_srv\\PYZ-00.pyz',
+('\\\\wsl$\\Debian\\home\\jd\\projects\\python\\build\\mqtt_srv\\PYZ-00.pyz',
  [('multiprocessing.popen_spawn_posix',
    'C:\\Program Files\\Python310\\lib\\multiprocessing\\popen_spawn_posix.py',
    'PYMODULE'),
@@ -281,6 +281,15 @@
   ('multiprocessing',
    'C:\\Program Files\\Python310\\lib\\multiprocessing\\__init__.py',
    'PYMODULE'),
+<<<<<<< HEAD
+=======
+  ('tracemalloc',
+   'C:\\Program Files\\Python310\\lib\\tracemalloc.py',
+   'PYMODULE'),
+  ('stringprep',
+   'C:\\Program Files\\Python310\\lib\\stringprep.py',
+   'PYMODULE'),
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
   ('_py_abc', 'C:\\Program Files\\Python310\\lib\\_py_abc.py', 'PYMODULE'),
   ('getpass', 'C:\\Program Files\\Python310\\lib\\getpass.py', 'PYMODULE'),
   ('nturl2path',

build/mqtt_srv/warn-mqtt_srv.txt

@@ -35,7 +35,7 @@ missing module named multiprocessing.get_start_method - imported by multiprocess
 missing module named pyimod02_importers - imported by C:\Users\jaydee\AppData\Roaming\Python\Python310\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (top-level)
 missing module named _scproxy - imported by urllib.request (conditional)
 missing module named termios - imported by getpass (optional), psutil._compat (delayed, optional)
-missing module named autorandr - imported by \\192.168.77.106\Data\__GITLAB\python\mqtt_srv.pyw (conditional)
+missing module named autorandr - imported by \\wsl$\Debian\home\jd\projects\python\mqtt_srv.pyw (conditional)
 missing module named psutil._psutil_aix - imported by psutil (top-level), psutil._psaix (top-level)
 missing module named psutil._psutil_sunos - imported by psutil (top-level), psutil._pssunos (top-level)
 missing module named psutil._psutil_bsd - imported by psutil (top-level), psutil._psbsd (top-level)

build/mqtt_srv/xref-mqtt_srv.html

@@ -15,7 +15,7 @@
 
 <div class="node">
   <a name="mqtt_srv.pyw"></a>
-  <a target="code" href="////192.168.77.106/Data/__GITLAB/python/mqtt_srv.pyw" type="text/plain"><tt>mqtt_srv.pyw</tt></a>
+  <a target="code" href="////wsl%24/Debian/home/jd/projects/python/mqtt_srv.pyw" type="text/plain"><tt>mqtt_srv.pyw</tt></a>
 <span class="moduletype">Script</span>  <div class="import">
 imports:
     <a href="#_collections_abc">_collections_abc</a>

mqtt_srv.py

@@ -19,7 +19,7 @@ import random
 import requests
 #import psutil
 stats = {}
-VERSION = "1.0.22"
+VERSION = "1.0.23"
 curos = platform.system() 
 host = platform.node().lower()
 print(host)
@@ -990,7 +990,7 @@ if curos == "Windows":
                         results["status"] = "on"
                     except:
                         print("aida initializing...")
-                        results = {}
+                        results = {"status":"init"}
                     
                     
                 else:
@@ -1012,7 +1012,11 @@ if curos == "Windows":
                         print(psutil.sensors_fans())
                     except:
                         pass
+<<<<<<< HEAD
                     results = {"status":"on", "version":VERSION,"MB_TEMP":"NA", "MEM_UTIL":str(mem_data.percent), "CPU_TEMP":"NA", "FAN_CPU":"NA",  "VMEM_UTIL":swap_data.percent, "CPU_UTIL":cpu_usage, "GPU_TEMP":"NA", "GPU_UTIL":"NA"}
+=======
+                    results = {"status":"on","version":VERSION,"MB_TEMP":"NA", "MEM_UTIL":str(mem_data.percent), "CPU_TEMP":"NA", "FAN_CPU":"NA",  "VMEM_UTIL":swap_data.percent, "CPU_UTIL":cpu_usage, "GPU_TEMP":"NA", "GPU_UTIL":"NA"}
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
                 print(json.dumps(results))
                 r = json.dumps(results)
                 #client.publish("home-assistant/" + host + "/hwstats", payload='{"TPCHDIO":"' + str(results["TPCHDIO"]) + '", "SMEMUTI":"' + str(results["SMEMUTI"]) + '", "TCPU":"' + str(results["TCPU"]) + '", "TGPU1DIO":"' + str(results["TGPU1DIO"]) + '", "SGPU1BIUTI":"' + str(results["SGPU1BIUTI"]) + '", "FCPU":"' + str(results["FCPU"]) + '", "SVIRTMEMUTI":"' + str(results["SVIRTMEMUTI"]) + '", "SCPUUTI":"' + str(results["SCPUUTI"]) + '"}', qos=0, retain=False)
@@ -1063,7 +1067,12 @@ else:
                 #print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"]))
                 #print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_input"]))
                 #client.publish("sectorq/monitor/" + host.lower(), payload="{\"mb_temp\":0,\"mem_usage\":0,\"cpu_temp\":0,\"cpu_usage\":0,\"gpu_temp\":0,\"gpu_usage\":0}", qos=0, retain=False)
+<<<<<<< HEAD
                 client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on","version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":' + str(fan_data.current) + ', "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+=======
+                client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":' + str(fan_data.current) + ', "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+                client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True)
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
             elif host.lower() == "openmediavault" or host.lower() == "omv":
                 #print(psutil.sensors_temperatures())
                 #print(psutil.sensors_fans())

mqtt_srv.pyw

@@ -19,7 +19,7 @@ import random
 import requests
 #import psutil
 stats = {}
-VERSION = "1.0.22"
+VERSION = "1.0.23"
 curos = platform.system() 
 host = platform.node().lower()
 print(host)
@@ -989,7 +989,7 @@ if curos == "Windows":
                         results["status"] = "on"
                     except:
                         print("aida initializing...")
-                        results = {}
+                        results = {"status":"init"}
                     
                     
                 else:
@@ -1011,7 +1011,11 @@ if curos == "Windows":
                         print(psutil.sensors_fans())
                     except:
                         pass
+<<<<<<< HEAD
                     results = {"status":"on", "version":VERSION,"MB_TEMP":"NA", "MEM_UTIL":str(mem_data.percent), "CPU_TEMP":"NA", "FAN_CPU":"NA",  "VMEM_UTIL":swap_data.percent, "CPU_UTIL":cpu_usage, "GPU_TEMP":"NA", "GPU_UTIL":"NA"}
+=======
+                    results = {"status":"on","version":VERSION,"MB_TEMP":"NA", "MEM_UTIL":str(mem_data.percent), "CPU_TEMP":"NA", "FAN_CPU":"NA",  "VMEM_UTIL":swap_data.percent, "CPU_UTIL":cpu_usage, "GPU_TEMP":"NA", "GPU_UTIL":"NA"}
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
                 print(json.dumps(results))
                 r = json.dumps(results)
                 #client.publish("home-assistant/" + host + "/hwstats", payload='{"TPCHDIO":"' + str(results["TPCHDIO"]) + '", "SMEMUTI":"' + str(results["SMEMUTI"]) + '", "TCPU":"' + str(results["TCPU"]) + '", "TGPU1DIO":"' + str(results["TGPU1DIO"]) + '", "SGPU1BIUTI":"' + str(results["SGPU1BIUTI"]) + '", "FCPU":"' + str(results["FCPU"]) + '", "SVIRTMEMUTI":"' + str(results["SVIRTMEMUTI"]) + '", "SCPUUTI":"' + str(results["SCPUUTI"]) + '"}', qos=0, retain=False)
@@ -1062,7 +1066,12 @@ else:
                 #print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"]))
                 #print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_input"]))
                 #client.publish("sectorq/monitor/" + host.lower(), payload="{\"mb_temp\":0,\"mem_usage\":0,\"cpu_temp\":0,\"cpu_usage\":0,\"gpu_temp\":0,\"gpu_usage\":0}", qos=0, retain=False)
+<<<<<<< HEAD
                 client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on","version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":' + str(fan_data.current) + ', "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+=======
+                client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":' + str(fan_data.current) + ', "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+                client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True)
+>>>>>>> fba8088e24f4b4228930b1a72ca37b712d90c824
             elif host.lower() == "openmediavault" or host.lower() == "omv":
                 #print(psutil.sensors_temperatures())
                 #print(psutil.sensors_fans())