fusuma 2.5.1 → 3.0.0

data/lib/fusuma.rb

@@ -13,9 +13,9 @@ module Fusuma
   class Runner
     class << self
       def run(option = {})
-        set_trap
         read_options(option)
         instance = new
+        instance.set_trap
         ## NOTE: Uncomment following line to measure performance
         # instance.run_with_lineprof
         instance.run
@@ -23,11 +23,6 @@ module Fusuma
 
       private
 
-      def set_trap
-        Signal.trap("INT") { puts exit } # Trap ^C
-        Signal.trap("TERM") { puts exit } # Trap `Kill `
-      end
-
       def read_options(option)
         MultiLogger.filepath = option[:log_filepath]
         MultiLogger.instance.debug_mode = option[:verbose]
@@ -56,7 +51,9 @@ module Fusuma
     end
 
     def initialize
-      @inputs = Plugin::Inputs::Input.plugins.map(&:new)
+      @inputs = Plugin::Inputs::Input.plugins.map do |cls|
+        cls.ancestors.include?(Singleton) ? cls.instance : cls.new
+      end
       @filters = Plugin::Filters::Filter.plugins.map(&:new)
       @parsers = Plugin::Parsers::Parser.plugins.map(&:new)
       @buffers = Plugin::Buffers::Buffer.plugins.map(&:new)
@@ -75,8 +72,8 @@ module Fusuma
       parsed = parse(filtered) || return
       buffered = buffer(parsed) || return
       detected = detect(buffered) || return
-      condition, context, event = merge(detected) || return
-      execute(condition, context, event)
+      context, event = merge(detected) || return
+      execute(context, event)
     end
 
     # For performance monitoring
@@ -98,12 +95,14 @@ module Fusuma
 
     # @param [Plugin::Events::Event]
     # @return [Plugin::Events::Event]
+    # @return [NilClass]
     def filter(event)
       event if @filters.any? { |f| f.filter(event) }
     end
 
     # @param [Plugin::Events::Event]
     # @return [Plugin::Events::Event]
+    # @return [NilClass]
     def parse(event)
       @parsers.reduce(event) { |e, p| p.parse(e) if e }
     end
@@ -117,6 +116,7 @@ module Fusuma
 
     # @param buffers [Array<Buffer>]
     # @return [Array<Event>]
+    # @return [NilClass]
     def detect(buffers)
       matched_detectors = @detectors.select do |detector|
         detector.watch? ||
@@ -124,7 +124,8 @@ module Fusuma
       end
 
       events = matched_detectors.each_with_object([]) do |detector, detected|
-        Array(detector.detect(@buffers)).each { |e| detected << e }
+        # Array(detector.detect(@buffers)).each { |e| detected << e }
+        detected.concat(Array(detector.detect(@buffers)))
       end
 
       return if events.empty?
@@ -133,7 +134,7 @@ module Fusuma
     end
 
     # @param events [Array<Plugin::Events::Event>]
-    # @return [Plugin::Events::Event] Event merged all records from arguments
+    # @return [Array<Hash, Plugin::Events::Event>] Event merged all events from arguments and used context
     # @return [NilClass] when event is NOT given
     def merge(events)
       index_events, context_events = events.partition { |event| event.record.type == :index }
@@ -143,44 +144,34 @@ module Fusuma
       end
       main_events.sort_by! { |e| e.record.trigger_priority }
 
-      matched_condition = nil
       matched_context = nil
       event = main_events.find do |main_event|
         matched_context = Config::Searcher.find_context(request_context) do
-          matched_condition, modified_record = Config::Searcher.find_condition do
-            main_event.record.merge(records: modifiers.map(&:record))
-          end
-          if matched_condition && modified_record
+          if modified_record = main_event.record.merge(records: modifiers.map(&:record))
             main_event.record = modified_record
-          else
-            matched_condition, = Config::Searcher.find_condition do
-              Config.search(main_event.record.index) &&
-                Config.find_execute_key(main_event.record.index)
-            end
+          elsif !modifiers.empty?
+            # try basically the same, but without any modifiers
+            # if modifiers is empty then we end up here only if there is no execute key for this
+            Config.instance.search(main_event.record.index) &&
+              Config.instance.find_execute_key(main_event.record.index)
           end
         end
       end
       return if event.nil?
 
-      [matched_condition, matched_context, event]
+      [matched_context, event]
     end
 
+    # @return [NilClass] when event is NOT given or executable context is NOT found
     # @param event [Plugin::Events::Event]
-    def execute(condition, context, event)
+    def execute(context, event)
       return unless event
 
-      # Find executable condition and executor
-      executor = Config::Searcher.with_context(context) do
-        Config::Searcher.with_condition(condition) do
-          @executors.find { |e| e.executable?(event) }
-        end
-      end
-
-      return if executor.nil?
-
-      # Check interval and execute
+      # Find executable context
       Config::Searcher.with_context(context) do
-        Config::Searcher.with_condition(condition) do
+        executor = @executors.find { |e| e.executable?(event) }
+        if executor
+          # Check interval and execute
           executor.enough_interval?(event) &&
             executor.update_interval(event) &&
             executor.execute(event)
@@ -191,5 +182,24 @@ module Fusuma
     def clear_expired_events
       @buffers.each(&:clear_expired)
     end
+
+    def set_trap
+      Signal.trap("INT") {
+        shutdown
+        puts exit
+      } # Trap ^C
+      Signal.trap("TERM") {
+        shutdown
+        puts exit
+      } # Trap `Kill `
+    end
+
+    private
+
+    def shutdown
+      [@inputs, @filters, @parsers, @buffers, @detectors, @executors].flatten.each do |plugin|
+        plugin.shutdown
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 3.0.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-12 00:00:00.000000000 Z
+date: 2023-08-19 00:00:00.000000000 Z
 dependencies: []
 description: Fusuma is multitouch gesture recognizer. This gem makes your touchpad
   on Linux able to recognize swipes or pinchs and assign command to them. Read installation
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Multitouch gestures with libinput driver, Linux