fusuma-plugin-appmatcher 0.7.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ff585f50332d6d07f2a160b9d940ae58d5f2fd6fee54b25289df480d5a2c04
-  data.tar.gz: 1421a3f34917a949932aadad5c2d3343b12bf133a7abe2c1eacc0e9a13ce46f0
+  metadata.gz: 69bf1d29cc81954c8ceb160cbce4ce71da3156ba3f836a69285c01a3d31c2d8f
+  data.tar.gz: a912664d466fc86797d389e8608b6100aa748ee1dc82de65e2e272ef61c06acf
 SHA512:
-  metadata.gz: d629c722c4caf82eba94e6ae3965bbb60c4df0b086277bfc3b1dd770fa73b07f27b23b7a1de5a9cc714d0c43ab3715788711f0e9903c2bb759c8c4c241816b51
-  data.tar.gz: 6cf64e2d1ca08e64108db1735f002d15a4a8b29d77a1027b19e81a7ceb45505277629d819fe785acb07aced79655b40f185ca1666fe3f3439072880bfed6f28c
+  metadata.gz: 30c39974d22d5b64f5efd306e7abcab89937890b9b191705293da312b15ea0f4e39a8de3225791c07188c37b4b00e3620746a5fc271ebfb4273f3ac524336202
+  data.tar.gz: 15b900560a0ea3a084e2acda300ee0d3327262b4127396ee80988962257181792154973b47da229e0bc6d0706a64e2b5423c6aef43c460a54b9af7980b243bbb

data/README.md

@@ -38,7 +38,7 @@ Google-chrome
 Alacritty
 ```
 
-You can use these applicatin name to under `application:` context in config.yml
+You can use these application name to under `application:` context in config.yml
 
 ## Add appmatcher properties and application names to config.yml
 

data/lib/fusuma/plugin/appmatcher/gnome_extension.rb

@@ -20,13 +20,10 @@ module Fusuma
         # fork process and watch signal
         # @return [Integer] Process id
         def watch_start
-          @watch_start ||= begin
-            pid = as_user(proctitle: self.class.name.underscore) do |user|
-              @reader.close
-              ENV["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/run/user/#{user.uid}/bus"
-              register_on_application_changed(Matcher.new)
-            end
-            pid
+          as_user(proctitle: self.class.name.underscore) do |user|
+            @reader.close
+            ENV["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/run/user/#{user.uid}/bus"
+            register_on_application_changed(Matcher.new)
           end
         end
 

data/lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/metadata.json

@@ -2,7 +2,8 @@
   "name": "Appmatcher",
   "description": "notify focused application using D-Bus",
   "shell-version" : [
-    "45"
+    "45",
+    "46"
   ],
   "url" : "https://github.com/iberianpig/fusuma-plugin-appmatcher",
   "uuid": "appmatcher@iberianpig.dev",

data/lib/fusuma/plugin/appmatcher/gnome_extensions/installer.rb

@@ -2,6 +2,7 @@
 
 require_relative "../user_switcher"
 require "fileutils"
+require "yaml"
 
 module Fusuma
   module Plugin
@@ -11,24 +12,6 @@ module Fusuma
         class Installer
           include UserSwitcher
 
-          EXTENSION = "./appmatcher@iberianpig.dev"
-
-          def gnome_shell_extension_path
-            output = `gnome-shell --version`
-            version = output.match(/GNOME Shell (\d+\.\d+)/)
-
-            if version
-              version_number = version[1].to_f
-              if version_number >= 45.0
-                "./appmatcher45@iberianpig.dev"
-              else
-                "./appmatcher@iberianpig.dev"
-              end
-            else
-              "./appmatcher@iberianpig.dev"
-            end
-          end
-
           def install
             pid = as_user(proctitle: self.class.name.underscore) do |user|
               FileUtils.cp_r(source_path, install_path(user.username))
@@ -52,18 +35,41 @@ module Fusuma
             File.exist?(install_path)
           end
 
+          def enabled?
+            enabled_extensions = YAML.load(`gsettings get org.gnome.shell enabled-extensions`)
+            enabled_extensions&.include?(EXTENSION)
+          end
+
           private
 
           def user_extension_dir(username = login_username)
             File.expand_path("#{Dir.home(username)}/.local/share/gnome-shell/extensions/")
           end
 
+          EXTENSION = "appmatcher@iberianpig.dev"
+          EXTENSION45 = "appmatcher45@iberianpig.dev"
           def install_path(username = login_username)
             File.expand_path("#{Dir.home(username)}/.local/share/gnome-shell/extensions/#{EXTENSION}")
           end
 
           def source_path
-            File.expand_path(gnome_shell_extension_path, __dir__)
+            File.expand_path(gnome_shell_extension_filename, __dir__)
+          end
+
+          def gnome_shell_extension_filename
+            output = `gnome-shell --version`
+            version = output.match(/GNOME Shell (\d+\.\d+)/)
+
+            if version
+              version_number = version[1].to_f
+              if version_number >= 45.0
+                EXTENSION45
+              else
+                EXTENSION
+              end
+            else
+              EXTENSION
+            end
           end
 
           def login_username

data/lib/fusuma/plugin/appmatcher/unsupported_backend.rb

@@ -22,19 +22,13 @@ module Fusuma
         # fork process and watch signal
         # @return [Integer] Process id
         def watch_start
-          @watch_start ||= begin
-            pid = as_user(proctitle: self.class.name.underscore) do
-              @reader.close
-              sleep # stop indefinitely without using CPU
-            end
-            pid
+          as_user(proctitle: self.class.name.underscore) do
+            @reader.close
+            sleep # stop indefinitely without using CPU
           end
         end
 
         class Matcher
-          def initialize
-          end
-
           def running_applications
             warn
             nil

data/lib/fusuma/plugin/appmatcher/version.rb

@@ -3,7 +3,7 @@
 module Fusuma
   module Plugin
     module Appmatcher
-      VERSION = "0.7.1"
+      VERSION = "0.9.0"
     end
   end
 end

data/lib/fusuma/plugin/appmatcher/x11.rb

@@ -21,12 +21,9 @@ module Fusuma
         # fork process and watch signal
         # @return [Integer] Process id
         def watch_start
-          @watch_start ||= begin
-            pid = as_user(proctitle: self.class.name.underscore) do |_user|
-              @reader.close
-              register_on_application_changed(Matcher.new)
-            end
-            pid
+          as_user(proctitle: self.class.name.underscore) do |_user|
+            @reader.close
+            register_on_application_changed(Matcher.new)
           end
         end
 

data/lib/fusuma/plugin/appmatcher.rb

@@ -3,7 +3,6 @@
 require "fusuma/plugin/appmatcher/version"
 
 require "fusuma/plugin/appmatcher/x11"
-require "fusuma/plugin/appmatcher/gnome"
 require "fusuma/plugin/appmatcher/gnome_extension"
 require "fusuma/plugin/appmatcher/gnome_extensions/installer"
 require "fusuma/plugin/appmatcher/unsupported_backend"
@@ -22,12 +21,19 @@ module Fusuma
         when /wayland/
           case xdg_current_desktop
           when /GNOME/
-            return GnomeExtension if GnomeExtensions::Installer.new.installed?
-
-            return Gnome
+            if GnomeExtensions::Installer.new.enabled?
+              return GnomeExtension
+            else
+              MultiLogger.warn "Appmatcher Gnome Shell Extension is NOT enabled"
+              MultiLogger.warn "Please enable it by running the following command:"
+              MultiLogger.warn ""
+              MultiLogger.warn "$ fusuma-appmatcher --install-gnome-extension"
+              MultiLogger.warn ""
+            end
           end
         end
 
+        MultiLogger.warn "appmatcher doesn't support"
         UnsupportedBackend
       end
 
@@ -36,7 +42,7 @@ module Fusuma
       end
 
       def xdg_current_desktop
-        ENV.fetch("XDG_CURRENT_DESKTOP", "")
+        ENV.fetch("ORIGINAL_XDG_CURRENT_DESKTOP", ENV.fetch("XDG_CURRENT_DESKTOP", ""))
       end
     end
   end

data/lib/fusuma/plugin/inputs/appmatcher_input.rb

@@ -7,20 +7,16 @@ module Fusuma
     module Inputs
       # Get active application's name
       class AppmatcherInput < Input
-        attr_reader :pid
-
         def io
-          @backend ||= Appmatcher.backend_klass.new
+          return @io if instance_variable_defined?(:@io)
 
-          @pid ||= begin
-            pid = @backend.watch_start
-            # NOTE: Closing the parent process's pipe
-            @backend.writer.close
+          @backend = Appmatcher.backend_klass.new
 
-            pid
-          end
+          @backend.watch_start
+          # NOTE: Closing the parent process's pipe
+          @backend.writer.close
 
-          @backend.reader
+          @io = @backend.reader
         end
 
         def shutdown
@@ -28,6 +24,7 @@ module Fusuma
           @backend.shutdown
         end
 
+        # TODO: use read_from_io
         # @param record [String] application name
         # @return [Event]
         def create_event(record:)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma-plugin-appmatcher
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.9.0
 platform: ruby
 authors:
 - iberianpig
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-03 00:00:00.000000000 Z
+date: 2025-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexml
@@ -68,7 +68,6 @@ files:
 - exe/fusuma-appmatcher
 - fusuma-plugin-appmatcher.gemspec
 - lib/fusuma/plugin/appmatcher.rb
-- lib/fusuma/plugin/appmatcher/gnome.rb
 - lib/fusuma/plugin/appmatcher/gnome_extension.rb
 - lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/extension.js
 - lib/fusuma/plugin/appmatcher/gnome_extensions/appmatcher45@iberianpig.dev/metadata.json
@@ -88,7 +87,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -103,8 +102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Fusuma plugin to assign gesture mapping per application
 test_files: []

data/lib/fusuma/plugin/appmatcher/gnome.rb

@@ -1,128 +0,0 @@
-# frozen_string_literal: true
-
-require "json"
-require "dbus"
-require_relative "user_switcher"
-
-module Fusuma
-  module Plugin
-    module Appmatcher
-      # Search Active Window's Name
-      class Gnome
-        include UserSwitcher
-
-        attr_reader :reader, :writer
-
-        def initialize
-          @reader, @writer = IO.pipe
-        end
-
-        # fork process and watch signal
-        # @return [Integer] Process id
-        def watch_start
-          @watch_start ||= begin
-            pid = as_user(proctitle: self.class.name.underscore) do |user|
-              @reader.close
-              ENV["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/run/user/#{user.uid}/bus"
-              register_on_application_changed(Matcher.new)
-            end
-            pid
-          end
-        end
-
-        private
-
-        def register_on_application_changed(matcher)
-          matcher.on_active_application_changed do |name|
-            notify(name)
-          end
-        end
-
-        def notify(name)
-          @writer.puts(name)
-        rescue Errno::EPIPE
-          exit 0
-        rescue => e
-          MultiLogger.error e.message
-          exit 1
-        end
-
-        # Look up application name using dbus
-        class Matcher
-          def initialize
-            session_bus = DBus.session_bus
-            service = session_bus.service("org.gnome.Shell")
-            @interface = service["/org/gnome/Shell"]["org.gnome.Shell"]
-          rescue DBus::Error => e
-            MultiLogger.error "DBus::Error: #{e.message}"
-
-            exit 1
-          end
-
-          # @return [Array<Application>]
-          def running_applications
-            gnome_shell_eval(
-              <<~GJS
-                global.get_window_actors().map(a => a.get_meta_window().get_wm_class());
-              GJS
-            )
-          end
-
-          def active_application
-            # const index = global.get_window_actors()
-            #                   .findIndex(a=>a.meta_window.has_focus()===true);
-            # global.get_window_actors()[index].get_meta_window().get_wm_class();
-            gnome_shell_eval(
-              <<~GJS
-                const actor = global.get_window_actors().find(a=>a.meta_window.has_focus()===true)
-                actor && actor.get_meta_window().get_wm_class()
-              GJS
-            )
-          end
-
-          # TODO
-          # def window_title
-          # # const index = global.get_window_actors()
-          # #                   .findIndex(a=>a.meta_window.has_focus()===true);
-          # # global.get_window_actors()[index].get_meta_window().get_title();
-          #   gnome_shell_eval(
-          #     # <<~GJS
-          #     #   global.get_window_actors().map((current) => {
-          #     #     const wm_class = current.get_meta_window().get_wm_class();
-          #     #     const title = current.get_meta_window().get_title();
-          #     #     return { application: wm_class, window_title: title }
-          #     #   })
-          #     # GJS
-          #   )
-          # end
-
-          def gnome_shell_eval(string)
-            success, body = @interface.Eval(string)
-
-            if success
-              response = begin
-                JSON.parse(body)
-              rescue
-                nil
-              end
-              return response
-            end
-
-            raise body
-          end
-
-          def on_active_application_changed
-            loop do
-              sleep 0.5
-              new_application = active_application
-              next if @old_application == new_application
-
-              yield(new_application || "NOT FOUND") if block_given?
-              @old_application = new_application
-            end
-          end
-        end
-      end
-    end
-  end
-end