gtk-stream 0.2__py3-none-any.whl → 0.2.2__py3-none-any.whl

gtk_stream/common.py

@@ -1,11 +1,19 @@
 import sys
 
-def printEvent(event, id, retval = None):
-    def ret(w):
+def _data_str_default(*args):
+    return ''
+def _data_str_by(get_data):
+    def ret(*args):
+        return ":"+get_data(*args)
+    return ret
+
+def printEvent(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(f"{id}:{event}", file=sys.stdout)
+            print("{}:{}{}".format(id,event,data_str(*args)), file=sys.stdout)
             sys.stdout.flush()
-        except:
-            print("Broken pipe, right ?", file=sys.stderr)
+        except Exception as e:
+            print("Exception when writing an event: {}".format(e), file=sys.stderr)
         return retval
     return ret

gtk_stream/documents/classes/Dropdown.py

@@ -1,5 +1,6 @@
 from ... import Gtk, Gio, GObject
 from .. import Document
+from ...common import printEvent
 
 class Item(Document):
     def __init__(self, app, value, **kwargs):
@@ -41,10 +42,7 @@ class Dropdown(Document):
 
         ret = Gtk.DropDown(model=model, expression=Gtk.PropertyExpression.new(_ItemObject, None, 'item_value'), factory=factory)
         
-        def on_selection_change(w,d):
-            print(f"{self.id}:selected:{w.get_selected_item().value}")
-            sys.stdout.flush()
-        ret.connect('notify::selected-item', on_selection_change)
+        ret.connect('notify::selected-item', printEvent('selected', self.id, get_data = lambda w,_: w.get_selected_item().value))
         return ret
     def attach_child(self, w, d):
         pass

gtk_stream/documents/classes/Switch.py

@@ -1,5 +1,3 @@
-import sys
-
 from ... import Gtk
 from ...common import printEvent
 from .. import Document
@@ -11,10 +9,7 @@ class Switch(Document):
         self.managed = parse_property('managed', managed)
     def render_raw(self):
         ret = Gtk.Switch()
-        def on_state_set(_x,new_state):
-            state = "on" if new_state else "off"
-            print(f"{self.id}:switch:{state}")
-            sys.stdout.flush()
-            return self.managed
-        ret.connect('state-set', on_state_set)
+        ret.connect('state-set', printEvent('switch', self.id,
+                                            retval = self.managed,
+                                            get_data = lambda _,state: "on" if state else "off"))
         return ret

{gtk_stream-0.2.dist-info → gtk_stream-0.2.2.dist-info}/METADATA

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

{gtk_stream-0.2.dist-info → gtk_stream-0.2.2.dist-info}/RECORD

@@ -1,23 +1,23 @@
 gtk_stream/__init__.py,sha256=pDhUSN4AYNsP8_tilU1zmDCYdiv7ak4PE1TW0qFrDlg,99
 gtk_stream/application.py,sha256=FZe4gQm5U0NGKKpi_Pp7VqxMtlbdbNJOYhcradzeSH4,3068
 gtk_stream/command_line.py,sha256=c2ghqIQB5hYxtCszss1z84yKoeRYvaMJJMi4aiTspWg,312
-gtk_stream/common.py,sha256=rua0TZFq4xhSQgb7PKfF3px0kS-XgKRUOMprm3H-Xqc,278
+gtk_stream/common.py,sha256=sEw15nVw9SVp8eLVOB5Zj1JITVhUhCF0i3PSwpd8lis,590
 gtk_stream/parser.py,sha256=ZyCm1WKgKH6syqyUCY7ZyTW642LMpzQ_dDSNsvcNsLY,6797
 gtk_stream/properties.py,sha256=9bYzvqmUq8EidtBDZdKupLgYM9ucIGyxmahcIp9TxT8,1542
 gtk_stream/documents/__init__.py,sha256=vTgKiiafqqkSOIUwOIzO40VsSdCpHFnGOGRm8rRv9mY,378
 gtk_stream/documents/classes/Box.py,sha256=6l9Z3GpC0Yv34jcGNTwlNLM5DpYyQ1iDihJsu1nxcy8,259
 gtk_stream/documents/classes/Button.py,sha256=_NjoOrgdSVK4RQbh0V-QiZ_hfHasaMc9LQ2bf2egbe4,747
 gtk_stream/documents/classes/Document.py,sha256=scoJrdHen_1WRuqn3aN6FJUesHXPZZyKwmPuPDjjbzI,985
-gtk_stream/documents/classes/Dropdown.py,sha256=uDH1yfYoEGugen6O62EMf7Dh9WfqFjUj_fgxFZ395VY,1718
+gtk_stream/documents/classes/Dropdown.py,sha256=0Y9Sua_0Y_1F6bq4SQe1IDdJThhh5KVpepAExcPo8bg,1675
 gtk_stream/documents/classes/Frame.py,sha256=p8OcgYBki1NWe2tveZfRwb0aQzRAeHQa9wHmpjgRJoc,391
 gtk_stream/documents/classes/Grid.py,sha256=SRDbMhPZHV372KN7Qr9vvamH2xwr39eojeWmI0Rf8hE,622
 gtk_stream/documents/classes/Label.py,sha256=BeL3zlf9YPuBGYS_YtHI0Q-MoVVLPao7kPIzPlwpyHY,275
 gtk_stream/documents/classes/Paned.py,sha256=4jZGEebhv9pNzTyYbQ8lyx_nsKd9Nmr10703V5n_kNw,644
 gtk_stream/documents/classes/ProgressBar.py,sha256=2_KCboyweGsqpBck61TvVGZYIsN8QVzAyqwwTDh-pDU,212
-gtk_stream/documents/classes/Switch.py,sha256=yvWbooJyrInwTBDMVFmSQVNL3LsB3_r2DHve7qpcqWY,640
+gtk_stream/documents/classes/Switch.py,sha256=uXmd_cZPZXkM31wYE4Z5d1-wuxqdt7wvS6qoE8ubaGc,610
 gtk_stream/documents/classes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-gtk_stream-0.2.dist-info/METADATA,sha256=xs2s_iAV1JrcSCw82wFDaU3IGaVnC9OW_gF9r3LPZhc,504
-gtk_stream-0.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-gtk_stream-0.2.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
-gtk_stream-0.2.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
-gtk_stream-0.2.dist-info/RECORD,,
+gtk_stream-0.2.2.dist-info/METADATA,sha256=YSIp8eUE3NYgYYotyx-SJ4gJlXVsdUprK0MayqS6rCE,506
+gtk_stream-0.2.2.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+gtk_stream-0.2.2.dist-info/entry_points.txt,sha256=PmhKTb4MMQM6dN2HJcoDSMI8L0lZIFIlFn-BgdfPDpo,60
+gtk_stream-0.2.2.dist-info/top_level.txt,sha256=vE9zfHGe9Ke7FSe0wBK2WYJI-BpcQNu6xDC3Cu5O8rQ,11
+gtk_stream-0.2.2.dist-info/RECORD,,