gtk-stream 0.7__py3-none-any.whl → 0.7.1__py3-none-any.whl

gtk_stream/application.py

@@ -20,8 +20,9 @@ from .common import printEvent
 from .properties import parse_property, get_prop_type
 
 class GtkStreamApp(Gtk.Application):
-    def __init__(self, name = None, **kwargs):
+    def __init__(self, logger, name = None, **kwargs):
         super().__init__(**kwargs)
+        self.logger = logger
         if name != None:
             GLib.set_application_name(name)
         self.namedWidgets = { }
@@ -66,7 +67,7 @@ class GtkStreamApp(Gtk.Application):
                 win.set_default_size(int(width), int(height))
             self.namedWindows[id] = win
             win.set_child(document.render())
-            win.connect('close-request', printEvent('close-request', id))
+            win.connect('close-request', printEvent(self.logger, 'close-request', id))
             win.present()
             return False
         self.run_when_idle(cb)

gtk_stream/command_line.py

@@ -16,22 +16,25 @@
 
 import io
 import xml.sax as sax
-import signal
 import sys
+import os
 
 from .parser import GtkStreamXMLHandler
+from .common import Logger, LogLevel
 from . import GLib
 
+logLevel = LogLevel.__dict__.get(os.environ.get('GTK_STREAM_LOGLEVEL', 'WARN'), LogLevel.WARN)
+
+logger = Logger(logLevel)
+
 class GtkStreamErrorHandler(sax.handler.ErrorHandler):
     def error(self, exc):
-        print("Error", file=sys.stderr)
         raise exc
     def fatalError(self, exc):
-        print("Fatal error", file=sys.stderr)
         raise exc
 
 def main():
-    handler = GtkStreamXMLHandler()
+    handler = GtkStreamXMLHandler(logger)
     errHandler = GtkStreamErrorHandler()
     parser = sax.make_parser()
     parser.setContentHandler(handler)
@@ -39,7 +42,5 @@ def main():
     try:
         parser.parse(io.FileIO(0, 'r', closefd=False))
     except Exception as e:
-        def quit():
-            handler.app.quit()
-        GLib.idle_add(quit)
-        print(f"Done with exception : {e}\n", file=sys.stderr)
+        logger.error("Done with exception : %s", e)
+    handler.quit_application()

gtk_stream/common.py

@@ -15,6 +15,7 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import sys
+from enum import Enum
 
 def _data_str_default(*args):
     return ''
@@ -23,13 +24,40 @@ def _data_str_by(get_data):
         return ":"+get_data(*args)
     return ret
 
-def printEvent(event, id, retval = None, get_data = None):
+def printEvent(logger, event, id, retval = None, get_data = None):
     data_str = _data_str_default if get_data == None else _data_str_by(get_data)
     def ret(*args):
         try:
             print("{}:{}{}".format(id,event,data_str(*args)), file=sys.stdout)
             sys.stdout.flush()
         except Exception as e:
-            print("Exception when writing an event: {}".format(e), file=sys.stderr)
+            logger.error("Exception when writing an event: %s", e)
         return retval
     return ret
+
+class LogLevel(Enum):
+    DEBUG = 0
+    INFO = 1
+    WARN = 2
+    ERROR = 3
+
+class Logger:
+    def __init__(self, level = LogLevel.WARN, stderr = sys.stderr):
+        self.stderr = stderr
+        self.level = level
+        self.debug = self._initLogger(LogLevel.DEBUG)
+        self.info  = self._initLogger(LogLevel.INFO)
+        self.warn  = self._initLogger(LogLevel.WARN)
+        self.error = self._initLogger(LogLevel.ERROR)
+    def flush(self):
+        self.stderr.flush()
+        
+    def _initLogger(self, level):
+        if self.level.value <= level.value:
+            def ret(fmt, *args):
+                print((f"[{level.name}]: {fmt}") % args, file=self.stderr)
+            return ret
+        else:
+            def ret(*args):
+                pass
+            return ret

gtk_stream/documents/classes/Button.py

@@ -24,7 +24,7 @@ class Button(Document):
         super().__init__(app, id = id, **kwargs)
     def render_raw(self):
         button = Gtk.Button()
-        button.connect('clicked', printEvent('clicked', self.id))
+        button.connect('clicked', printEvent(self.app.logger, 'clicked', self.id))
         return button
     def insert_child(self, w, d):
         w.set_child(d.render())
@@ -35,7 +35,7 @@ class LinkButton(Button):
         super().__init__(app, id=id, **kwargs)
     def render_raw(self):
         button = Gtk.LinkButton()
-        button.connect('activate-link', printEvent('clicked', self.id, True))
+        button.connect('activate-link', printEvent(self.app.logger, 'clicked', self.id, True))
         return button
     def insert_child(self, w, d):
         w.set_child(d.render())

gtk_stream/documents/classes/Document.py

@@ -33,8 +33,9 @@ class Document:
     def set_properties(self, w):
         self.app.nameWidget(self.id, w)
         for (p,v) in self.props.items():
-            # print(f"Setting property '{p}' to '{v}' in widget {self.__class__}", file=sys.stderr)
-            w.set_property(p, v(self.app))
+            val = v(self.app)
+            self.app.logger.debug("Setting property '%s' to '%s' in widget %s", p, val, self.__class__)
+            w.set_property(p, val)
         w.insert_child = lambda d: self.insert_child(w, d)
     def render(self):
         w = self.render_raw()

gtk_stream/documents/classes/Dropdown.py

@@ -59,7 +59,7 @@ class Dropdown(Document):
 
         ret = Gtk.DropDown(model=model, expression=Gtk.PropertyExpression.new(_ItemObject, None, 'item_value'), factory=factory)
         
-        ret.connect('notify::selected-item', printEvent('selected', self.id, get_data = lambda w,_: w.get_selected_item().value))
+        ret.connect('notify::selected-item', printEvent(self.app.logger, 'selected', self.id, get_data = lambda w,_: w.get_selected_item().value))
         return ret
     def insert_child(self, w, d):
         pass

gtk_stream/documents/classes/Switch.py

@@ -26,7 +26,7 @@ class Switch(Document):
         self.managed = parse_property('gboolean', managed)(app)
     def render_raw(self):
         ret = Gtk.Switch()
-        ret.connect('state-set', printEvent('switch', self.id,
+        ret.connect('state-set', printEvent(self.app.logger, 'switch', self.id,
                                             retval = self.managed,
                                             get_data = lambda _,state: "on" if state else "off"))
         return ret

gtk_stream/parser.py

@@ -51,13 +51,24 @@ WIDGET_DOCUMENTS = {
 }
 
 class GtkStreamXMLHandler(sax.ContentHandler):
-    def __init__(self):
+    def __init__(self, logger):
+        self.logger = logger
         self.transition_enter = self.transE_conn
         self.transition_leave = self.transL_final
         self.transition_chars = self.ignore_chars
         self.namedWidgets = { }
         self.windows = { }
 
+    def quit_application(self):
+        def cb():
+            self.logger.info("Quitting app")
+            self.app.quit()
+        GLib.idle_add(cb)
+        self.logger.info("Waiting for app to terminate")
+        self.app_thread.join()
+        self.logger.info("App terminated")
+        sys.exit(0)
+
     def setNamed(self, attrs, ):
         if 'id' in attrs:
             self.namedWidgets[attrs['id']] = widget
@@ -82,20 +93,20 @@ class GtkStreamXMLHandler(sax.ContentHandler):
     def transE_conn(self, name, attrs):
         match name:
             case 'application':
-                self.app = GtkStreamApp(**attrs)
+                self.app = GtkStreamApp(self.logger, **attrs)
                 def on_activate(a):
                     a.hold()
                 self.app.connect('activate', on_activate)
                 def appMain():
                     self.app.run([])
-                threading.Thread(target = appMain).start()
+                self.app_thread = threading.Thread(target = appMain)
+                self.app_thread.start()
+
                 def on_sigint(a,b):
-                    def cb():
-                        print("SIGINT received", file=sys.stderr)
-                        self.app.quit()
-                        sys.exit(0)
-                    GLib.idle_add(cb)
+                    self.logger.info("SIGINT received")
+                    self.quit_application()
                 signal.signal(signal.SIGINT, on_sigint)
+
                 self.transition_enter = self.transE_message
                 self.transition_leave = self.transL_tag('application', self.transE_final, self.transL_final)
             case _:

{gtk_stream-0.7.dist-info → gtk_stream-0.7.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.7
+Version: 0.7.1
 Summary: A simple stream-oriented GUI protocol
 Author-email: Marc Coiffier <marc.coiffier@univ-grenoble-alpes.fr>
 Project-URL: Homepage, https://coiffier.net/projects/gtk-stream/

{gtk_stream-0.7.dist-info → gtk_stream-0.7.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 gtk_stream/__init__.py,sha256=pDhUSN4AYNsP8_tilU1zmDCYdiv7ak4PE1TW0qFrDlg,99
-gtk_stream/application.py,sha256=g95IbeV2fjKf55bRqBCl9EpdiA-sR9XHmp6BMGZBAbo,3836
-gtk_stream/command_line.py,sha256=6Yj6NV12cqlnSE5ZHTjNqxE6ZtosuWAiJm66awpJ2H8,1503
-gtk_stream/common.py,sha256=wjByU_xhzgCKJFSkEr0gNsi2dqv38kA9_2DodRRrBw4,1310
-gtk_stream/parser.py,sha256=9AfSOb-T7O98A-XIH16eBBC6eA0jsFmEVi3F19kAiGY,8063
+gtk_stream/application.py,sha256=gOsJv6AUizfQZrwNe9LxVz9dOKScxzw97XO3lRTmxRs,3886
+gtk_stream/command_line.py,sha256=Ej4mmPiuYjr5-1JrvjGK0BDitKUCfVEI9uHp1p_FAr4,1520
+gtk_stream/common.py,sha256=xdscxYgBg_Ux6iyk26gB-AMSgoUIqlZUPgso5YS_gKE,2106
+gtk_stream/parser.py,sha256=hzy-hHsLAHZb7fQk40fRNY8tOC9onBk5jAOhT904D6Y,8356
 gtk_stream/properties.py,sha256=r_zxYIBe5g8SGueuhtf5CIAWesmm2tXv6llh6657a74,2374
 gtk_stream/documents/__init__.py,sha256=_y2h6kINZGuYibRgfgVwtmZGmSdIBHZP0TUB182Ado8,741
 gtk_stream/documents/classes/Box.py,sha256=d01o2-JQ3-k0VjvvY8E7mly-u_f1v1NqYz1IDjHZLUo,1381
-gtk_stream/documents/classes/Button.py,sha256=NoDuAwd2XqXY8ZvyOg9xeKIru71JBi4ZFS3Oe6P478Q,1529
-gtk_stream/documents/classes/Document.py,sha256=m_N7UCxHmdlQ34OvP91EvUEdl40CzuRngeJRj9w3dPU,2109
-gtk_stream/documents/classes/Dropdown.py,sha256=NUUQ24yrJomlwcXWgm73kEsAsy4Eej6udg77HFBgiZs,2426
+gtk_stream/documents/classes/Button.py,sha256=0Cs5DOt-FoDVLWIktJHuH6OasI58TNI0Gs3uIKJDj2o,1563
+gtk_stream/documents/classes/Document.py,sha256=drWy-2HzgmpxSmRR27uIydlTJbaYTiRJPWwpELXrGSk,2135
+gtk_stream/documents/classes/Dropdown.py,sha256=1azU_iHbr_-099wj0_TDfDfZ5xKyh9xLFd5GvbNMw14,2443
 gtk_stream/documents/classes/FlowBox.py,sha256=UoVYS2j_osOV-IgbVoaqluTBCiaXus5dq2e9qhAu2Xo,1225
 gtk_stream/documents/classes/Frame.py,sha256=zAZvsT-YTZMijsgk7p0YVf6siAmFoCCSXouZo9XDpsA,1222
 gtk_stream/documents/classes/Grid.py,sha256=jDJ9U1GJZ45hi1VvPsCwFILN7CwEkgjqYqhTzMdtX9o,1249
@@ -19,10 +19,10 @@ gtk_stream/documents/classes/ProgressBar.py,sha256=NPJtP3qaKiZUEAYEHZk4FEoWSFn2K
 gtk_stream/documents/classes/ScrolledWindow.py,sha256=WaTPgz6GBC-hjH83SQT2OGUdCapHAgO3xEmSMJZ8q70,1041
 gtk_stream/documents/classes/Separator.py,sha256=uw_EgAKs_6pNA8nrOLzruIlJfk4uaogB0p_jeoY0PHM,960
 gtk_stream/documents/classes/Stack.py,sha256=YA6NDzZL2u4Ko8GXtx8Or-jEWGMCEw2cC1HNkAMRw-8,1030
-gtk_stream/documents/classes/Switch.py,sha256=bLOkyAy_v2T_Gli9c6TAhnUJcqhbnxbD9oswPdTAsGo,1365
+gtk_stream/documents/classes/Switch.py,sha256=OLCWWNeVyNrk4Tu3JDe64FqsLhedh3dDzKDKne2CyDw,1382
 gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.7.dist-info/METADATA,sha256=ReGnW0Nugu54Bbmm4GMDzE0vxxoZBk1Mfy8BQQPzv4c,804
-gtk_stream-0.7.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gtk_stream-0.7.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.7.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.7.dist-info/RECORD,,
+gtk_stream-0.7.1.dist-info/METADATA,sha256=SwTjqF9xkKbnfugzNuA9zOd6Fljaq0AsIC_es6YiY34,806
+gtk_stream-0.7.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gtk_stream-0.7.1.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.7.1.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.7.1.dist-info/RECORD,,