gtk-stream 0.6.1__tar.gz → 0.7.1__tar.gz

{gtk_stream-0.6.1 → gtk_stream-0.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.6.1
+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.6.1 → gtk_stream-0.7.1}/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-0.6.1 → gtk_stream-0.7.1}/gtk_stream/command_line.py

@@ -16,15 +16,31 @@
 
 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):
+        raise exc
+    def fatalError(self, exc):
+        raise exc
 
 def main():
-    handler = GtkStreamXMLHandler()
+    handler = GtkStreamXMLHandler(logger)
+    errHandler = GtkStreamErrorHandler()
     parser = sax.make_parser()
     parser.setContentHandler(handler)
+    parser.setErrorHandler(errHandler)
     try:
         parser.parse(io.FileIO(0, 'r', closefd=False))
-    finally:
-        handler.app.release()
+    except Exception as e:
+        logger.error("Done with exception : %s", e)
+    handler.quit_application()

{gtk_stream-0.6.1 → gtk_stream-0.7.1}/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-0.6.1 → gtk_stream-0.7.1}/gtk_stream/documents/__init__.py

@@ -10,6 +10,7 @@ from .classes.Dropdown       import Dropdown, Item
 from .classes.Switch         import Switch
 
 from .classes.Box            import Box, BoxPrepend
+from .classes.FlowBox        import FlowBox, FlowBoxPrepend
 from .classes.ScrolledWindow import ScrolledWindow
 from .classes.Paned          import Paned
 from .classes.Frame          import Frame, FrameLabel

{gtk_stream-0.6.1 → gtk_stream-0.7.1}/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-0.6.1 → gtk_stream-0.7.1}/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-0.6.1 → gtk_stream-0.7.1}/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-0.7.1/gtk_stream/documents/classes/FlowBox.py

@@ -0,0 +1,34 @@
+# Gtk-Stream : A stream-based GUI protocol
+# Copyright (C) 2024  Marc Coiffier
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+from ... import Gtk
+from .. import Document, PseudoDocument
+
+class FlowBoxPrepend(PseudoDocument):
+    def __init__(self, app):
+        super().__init__(app)
+
+class FlowBox(Document):
+    __g_class__ = Gtk.FlowBox
+    def __init__(self, app, **kwargs):
+        super().__init__(app, **kwargs)
+    def render_raw(self):
+        return Gtk.FlowBox()
+    def insert_child(self, w, d):
+        if isinstance(d, FlowBoxPrepend):
+            w.prepend(d.render())
+        else:
+            w.append(d.render())

{gtk_stream-0.6.1 → gtk_stream-0.7.1}/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-0.6.1 → gtk_stream-0.7.1}/gtk_stream/parser.py

@@ -45,17 +45,30 @@ WIDGET_DOCUMENTS = {
     'picture'         : docs.Picture,
     'separator'       : docs.Separator,
     'scrolled-window' : docs.ScrolledWindow,
-    'stack'           : docs.Stack
+    'stack'           : docs.Stack,
+    'flow-box'        : docs.FlowBox,
+    'flow-box-prepend': docs.FlowBoxPrepend
 }
 
 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
@@ -80,19 +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():
-                        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.6.1 → gtk_stream-0.7.1}/gtk_stream.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gtk-stream
-Version: 0.6.1
+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.6.1 → gtk_stream-0.7.1}/gtk_stream.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ gtk_stream/documents/classes/Box.py
 gtk_stream/documents/classes/Button.py
 gtk_stream/documents/classes/Document.py
 gtk_stream/documents/classes/Dropdown.py
+gtk_stream/documents/classes/FlowBox.py
 gtk_stream/documents/classes/Frame.py
 gtk_stream/documents/classes/Grid.py
 gtk_stream/documents/classes/Label.py

{gtk_stream-0.6.1 → gtk_stream-0.7.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gtk-stream"
-version = "0.6.1"
+version = "0.7.1"
 description = "A simple stream-oriented GUI protocol"
 authors = [
  { name = "Marc Coiffier", email = "marc.coiffier@univ-grenoble-alpes.fr" }