v0.7.4

improve ipc handling

* encapsulate
* sync way how ipc methods are set
* set them as early as possible
* better logging

Author: obestwalter

CHANGELOG.md

@@ -1,11 +1,21 @@
 # CHANGELOG
 
+## 0.7.4 (Packaging is fun and good for testing) - 2017-06-11
+
+### Changed
+
+- improve ipc handling - fix setting methods too late
+
 ## 0.7.3 (Do the right thing) - 2017-06-11
 
+### Fixed
+
 - use actual partials path for initialization instead of assuming that parent of config path == partials path
 
 ## 0.7.2 (Need for speed) - 2017-06-11
 
+### Changed
+
 - shave off a few hundred precious milliseconds startup time, by moving the very expensive version fetching into a function that is only called, when the version is really needed.
 - help the user, when they use a non existing command
 - remove unwanted side effects from message

i3configger/build.py

@@ -85,7 +85,7 @@ def generate_status_file_content(prts, selectKey, selectValue, ctx):
 def check_config(content):
     tmpPath = Path(tempfile.gettempdir()) / 'i3config_check'
     tmpPath.write_text(content)
-    errorReport = ipc.I3.get_config_errors(tmpPath)
+    errorReport = ipc.I3.get_config_error_report(tmpPath)
     if errorReport:
         raise exc.ConfigError(
             f"config:\n{content}\n\nerrors:\n{errorReport.decode()}"

i3configger/ipc.py

@@ -1,6 +1,21 @@
+import logging
 import subprocess
 
-from i3configger.base import log
+log = logging.getLogger(__name__)
+
+
+def configure(args):
+    I3.set_msg_type(args.i3_refresh_msg)
+    log.info(f'set i3 refresh method to {I3.refresh.__name__}', )
+    Notify.set_notify_command(args.notify)
+    log.info(f'set notify method to {Notify.send.__name__}', )
+
+
+def communicate(msg='new config active', refresh=False):
+    if refresh:
+        I3.refresh()
+        StatusBar.refresh()
+    Notify.send(msg)
 
 
 class I3:
@@ -38,30 +53,30 @@ def _send_i3_msg(cls, msg):
                 return True
 
     @classmethod
-    def get_config_errors(cls, path):
+    def get_config_error_report(cls, path):
+        cmd = ['i3', '-C', '-c', str(path)]
         try:
-            subprocess.check_output(['i3', '-C', '-c', str(path)])
-            return None
+            return subprocess.check_output(cmd).decode()
         except subprocess.CalledProcessError as e:
             return e.output
 
 
 class Notify:
     @classmethod
     def set_notify_command(cls, notify):
-        if not notify:
-            log.debug("do not send notifications")
-            cls.send = cls.nop
+        cls.send = cls.notify_send if notify else cls.nop
 
     @classmethod
-    def send(cls, msg, urgency='low'):
+    def notify_send(cls, msg, urgency='low'):
         subprocess.check_call([
             'notify-send', '-a', 'i3configger', '-t', '1', '-u', urgency, msg])
 
     @staticmethod
     def nop(*args, **kwargs):
         pass
 
+    send = notify_send
+
 
 class StatusBar:
     @classmethod

i3configger/main.py

@@ -19,6 +19,7 @@ def main():
 
 
 def _main(args):
+    ipc.configure(args)
     if args.version:
         print(f"i3configger {base.get_version()}")
         return 0
@@ -35,9 +36,6 @@ def _main(args):
             sys.exit("Already running - did you mean to send a message?")
         log.info("let the daemon do the work")
         return 0
-    ipc.I3.set_msg_type(args.i3_refresh_msg)
-    log.info("set i3 refresh method to %s", ipc.I3.refresh)
-    ipc.Notify.set_notify_command(args.notify)
     if args.daemon:
         daemonize.daemonize(args.v, args.log, configPath)
     elif args.watch:
@@ -47,6 +45,4 @@ def _main(args):
             sys.exit("interrupted by user")
     else:
         build.build_all(configPath)
-        ipc.I3.refresh()
-        ipc.StatusBar.refresh()
-        ipc.Notify.send('new config active')
+        ipc.communicate(refresh=True)

i3configger/watch.py

@@ -25,6 +25,4 @@ def forever(configPath):
         paths = [partialsPath / e[-1] for e in events]
         if any(p.suffix in [base.SUFFIX, '.json'] for p in paths):
             build.build_all(configPath)
-            ipc.I3.refresh()
-            ipc.StatusBar.refresh()
-            ipc.Notify.send('new config active')
+            ipc.communicate(refresh=True)