Add files via upload

Author: gitagogaming

entry.py

@@ -4,7 +4,7 @@
 ## Entry.py - ColorPicker
 
 
-__version__ = 1.4
+__version__ = 1.5
 PLUGIN_ID = "tp.plugin.process_monitor"
 PLUGIN_NAME = "Process_Monitor"
 

entry.tp

@@ -1,6 +1,6 @@
 {
   "sdk": 6,
-  "version": 140,
+  "version": 150,
   "name": "Process Monitor",
   "id": "tp.plugin.process_monitor",
   "configuration": {

process_checker.py

@@ -1,9 +1,11 @@
-#process checker
+#Process Monitor
+# Created by @Gitago for TouchPortal
+# Jan, 2023
 
 
 ## BUGS
 ## when checking for a process if its NOT loaded, then no states are made or mention that its not running.. but if its runing then you close it updates as expected
-
+# when stopping a monitor it doesnt seem to clear the length of total?
 
 import TouchPortalAPI as TP
 from argparse import ArgumentParser
@@ -15,31 +17,26 @@
 import sys
 import webbrowser
 import time
+import requests
+import base64
+import time
 
 PLUGIN_NAME = "Process Monitor"
 PLUGIN_ID = "tp.plugin.process_monitor"
 GITHUB_URL = "process-monitor-touchportal-plugin"
 # DEFAULT_CONFIG_SAVE_PATH = path.join(path.dirname(path.realpath(__file__)), "color_config.json")
 
-def handleSettings(settings, on_connect=False):
-    ## Setting the Color Naming Convention based on user input
-    print("Settings: " + str(settings))
-  #  the_colors.color_name_setting = settings[0]['Color Names - Can be changed via plugin actions']
-   # TPClient.stateUpdate(stateId=PLUGIN_ID + ".state.current_text_name_style", stateValue=the_colors.color_name_setting)
-
-
 
 
 
-
-
-import time
+process_monitor_choiceList = []
+process_monitor_dict = {}
 
 class ProcessChecker:
     def __init__(self, process_name):
         self.process_name = process_name
         self.should_continue = True
-        
+      #  self.process_monitor_choiceList = []
 
 
     def time_completion(self, data, the_process):
@@ -50,31 +47,36 @@ def time_completion(self, data, the_process):
         print("Task completed in: ", completion_time, " seconds")
 
 
-    def the_task(self, data, the_process):
+    def the_task(self, process_name, the_process):
         process_checked = self.is_running()
 
+        global process_monitor_choiceList
+        
+      #  print("This is process checked the is_running stuff", process_checked)
 
         if process_checked == False:
             for x in ['pid', 'username', 'cpu_percent', 'memory_percent', 'cmdline', 'create_time']:
                 TPClient.createState(stateId=PLUGIN_ID + f".state.{self.process_name}.process_info.{x}", description=f"PM | {self.process_name} - {x}", value="", parentGroup=str(self.process_name))
 
-            process_monitor_dict[data] = the_process
-            TPClient.stateUpdate(stateId=PLUGIN_ID + ".state.process_monitor.count", stateValue=str(len(process_monitor_dict.keys())))
-            
+            # Updating Status to "Closed" since the process appears to not be running
             TPClient.createState(stateId=PLUGIN_ID + f".state.{self.process_name}.process_info.status", description=f"PM | {self.process_name} - status", value="Closed", parentGroup=str(self.process_name))
 
-        
         if process_checked:
-            process_monitor_dict[data] = the_process
+            process_monitor_dict[process_name] = the_process
             the_list = list(process_monitor_dict.keys())
             the_list.append("ALL")
 
-            TPClient.choiceUpdate(choiceId=PLUGIN_ID + ".act.process_name.stop", values=the_list)
+            # Checking to see if the Process monitor Choice List is the same, if so we dont update it
+            if process_monitor_choiceList != the_list:
+                ## submitted a PR for this to be added to the API by default
+                TPClient.choiceUpdate(choiceId=PLUGIN_ID + ".act.process_name.stop", values=the_list)
+          
+            process_monitor_choiceList = the_list
 
             ## update a state showing how many values are in the list minus the "ALL" value
             TPClient.stateUpdate(stateId=PLUGIN_ID + ".state.process_monitor.count", stateValue=str(len(the_list) - 1))
 
-            print(f"{the_process.process_name} is running")
+          #  print(f"{the_process.process_name} is running")
 
             for x in process_checked:
                 if x == 'memory_percent':
@@ -90,47 +92,38 @@ def the_task(self, data, the_process):
 
                 ## use a thread to create sttes as fast as possible
                 TPClient.createState(stateId=PLUGIN_ID + f".state.{the_process.process_name}.process_info.{x}", description=f"PM | {the_process.process_name} - {x}", value=str(process_checked.get(x, "None")), parentGroup=str(the_process.process_name))
-
-
-    
+                
+                
     def is_running(self):
 
         for process in psutil.process_iter():
-            if process.name() == self.process_name:
+            if process.name().lower() == self.process_name.lower():
                 process_Info = process.as_dict(attrs=['pid', 'name', 'username', 'cpu_percent', 'memory_percent', 'cmdline', 'create_time', 'status'])
+                        #    print("Before joiing the cmdline: ", process_checked)
+                process_Info["cmdline"] = ' '.join(process_Info["cmdline"])
+            
+           # print("After joiing the cmdline: ", process_checked)
+             #  memory_info = process.memory_info().rss
+             #  memory_mb = memory_info / 1048576
+             #  process_Info['memory_MB'] = memory_mb
                 return process_Info
 
         return False
 
 
-    def check_continuously(self, interval, data, the_process):
+    def check_continuously(self, interval, process_name, the_process):
         while self.should_continue:
             g_log.debug("Checking if " + self.process_name + " is running")
            # print("Checking if ",  self.process_name, " is running")
-            self.the_task(data, the_process=the_process)
+           
+            self.the_task(process_name = process_name, the_process=the_process)
             time.sleep(interval)
 
         return False
 
 
-    
     def stop(self):
         self.should_continue = False
-        
-
-
-
-# ## STARTING THE THING
-# pc = ProcessChecker("WizLight_Plugisn.exe")
-# 
-# is_running = pc.is_running()
-# 
-# check_always = pc.check_continuously(10)
-
-
-
-
-
 
 
 
@@ -148,14 +141,11 @@ def stop(self):
     sys.exit(f"Could not create TP Client, exiting. Error was:\n{repr(e)}")
 
 
-
 # Crate the global logger
 g_log = getLogger()
 
 
 
-
-
 @TPClient.on(TP.TYPES.onNotificationOptionClicked)
 def check_noti(data):
     if data['optionId'] == PLUGIN_ID+ '.update.download':
@@ -165,27 +155,26 @@ def check_noti(data):
 
 
 
-
 @TPClient.on(TP.TYPES.onConnect)
 def onConnect(data):
     g_log.info(f"Connected to TP v{data.get('tpVersionString', '?')}, plugin v{data.get('pluginVersion', '?')}.")
     g_log.debug(f"Connection: {data}")
     if settings := data.get('settings'):
         handleSettings(settings, True)
 
+    plugin_update_check(data)
     TPClient.stateUpdate(stateId=PLUGIN_ID + ".state.process_monitor.count", stateValue="0")
 
 
 
-
 @TPClient.on(TP.TYPES.onSettingUpdate)
 def onSettingUpdate(data):
     g_log.debug(f"Settings: {data}")
     if (settings := data.get('values')):
         handleSettings(settings, False)
 
 
-process_monitor_dict = {}
+
 
 @TPClient.on(TP.TYPES.onAction)
 def onAction(data):
@@ -196,14 +185,14 @@ def onAction(data):
 
     if not (action_data := data.get('data')) or not (aid := data.get('actionId')):
         return
-
+    
     ##  Get Color from Mouse
     if data['actionId'] == PLUGIN_ID + ".act.check_process":
 
         if data['data'][1]['value']:
             if data['data'][1]['value'] == "0":
-                the_process = ProcessChecker(data['data'][0]['value']) 
-                the_process.the_task(data=data, the_process=the_process)
+                the_process = ProcessChecker(data['data'][0]['value'])
+                the_process.the_task(process_name=data['data'][0]['value'], the_process=the_process)
             else:
                 print(f"Checking every {str(data['data'][1]['value'])} seconds for {data['data'][0]['value']}")
                 the_process = ProcessChecker(data['data'][0]['value']) 
@@ -215,8 +204,8 @@ def onAction(data):
 
 
                # process_checked = the_process.check_continuously(int(data['data'][1]['value']), data=data['data'][0]['value'], the_process=the_process)
-
-
+        
+        
     if data['actionId'] == PLUGIN_ID +".act.stop_process.Monitor":
         the_process = data['data'][0]['value']
         try:
@@ -243,6 +232,43 @@ def onAction(data):
 
 
 
+
+def handleSettings(settings, on_connect=False):
+    #print("Settings: " + str(settings))
+    pass
+
+
+
+def plugin_update_check(data):
+    """ 
+    Checks Github for the latest version of the plugin
+    - Returns patchnotes on notification if there is a new version 
+    """
+    
+    try:
+        github_check = TP.Tools.updateCheck("GitagoGaming", GITHUB_URL).replace('v','').replace(".","")
+        plugin_version = str(data['pluginVersion'])
+        
+        ## Checking to see if current version is different from github version
+        if github_check != plugin_version:
+            # Pulling Patch Notes for Notification
+            r = requests.get(f"https://api.github.com/repos/GitagoGaming/{GITHUB_URL}/contents/recent_patchnotes.txt")
+            message = base64.b64decode(r.json()['content']).decode('ascii')
+            
+            TPClient.showNotification(
+                    notificationId=PLUGIN_ID + ".update.check",
+                    title=f"{PLUGIN_NAME} Plugin {github_check} is available",
+                    msg=f"A new version of {PLUGIN_NAME} is available and ready to Download. This may include Bug Fixes and or New Features\n\nPatch Notes\n{message} ",
+                    options= [{
+                    "id":PLUGIN_ID + ".update.download",
+                    "title":"Click to Update!"
+                    }])
+    except Exception as e:
+        g_log.error("[UPDATE CHECK] Something went wrong checking update", e)
+
+
+
+
 # Shutdown handler
 @TPClient.on(TP.TYPES.onShutdown)
 def onShutdown(data):
@@ -258,6 +284,14 @@ def onShutdown(data):
 
 
 
+
+
+
+
+
+
+
+
 ## The Main + Logging System
 def main():
     global TPClient, g_log
@@ -329,9 +363,3 @@ def main():
 
 if __name__ == "__main__":
     sys.exit(main())
-    
-    
-
-
-## stop it
-#pc.stop()