fusuma 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd4670c6b29d118e7663736911b14298e526c3cea9a7886032b45f3f1f6aafed
-  data.tar.gz: 5b68ab3340e02aa3ed85b7985a8a58007d5567a81871c28465210d8e04561998
+  metadata.gz: ce8f9acb74d456ca14afae7b7cf83fa70e2c52adc81902e2e0eb7f1ff1d1c6aa
+  data.tar.gz: 121e54c98da13699bae297fea522f8004a73de33e438ffb9fd6161fb7b6df069
 SHA512:
-  metadata.gz: 4776baf12386df866c0034cc7c6b2e9deeffdc33f59c651ec03fcb53a385306a221e8ac01f4b261d197488d9895e688b31fa97801daf3c621079c1d452319a0d
-  data.tar.gz: c2bd43b3afe5748b8feaeec9a81b00c1753332d8abe239e7ef0a0a3305463004dd4210385f29e2a0cfe34853a8a0f2582a8984d35d90b05ee4acc592562931d1
+  metadata.gz: ce1727335f611a3d9ee099b8189bbf4e80d7f446173b696f46c1cada8b7185d19811a4227c73d3216e7e5a949bdfd838c7a5e1757351417642906b885cba383a
+  data.tar.gz: 0347fc47ef4ababac2b591156523c933fad9b045d8d76889d627ced6be0720a8719f69a4d02c2fff0ac94cb46eed5a77a16a117486cc0e9764ab4ee833f99f7f

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [v1.4.1](https://github.com/iberianpig/fusuma/tree/v1.4.1) (2020-02-27)
+
+[Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.4.0...v1.4.1)
+
 ## [v1.4.0](https://github.com/iberianpig/fusuma/tree/v1.4.0) (2020-02-18)
 
 [Full Changelog](https://github.com/iberianpig/fusuma/compare/v1.3.3...v1.4.0)
@@ -53,7 +57,6 @@
 **Merged pull requests:**
 
 - Merge modifier event records [\#142](https://github.com/iberianpig/fusuma/pull/142) ([iberianpig](https://github.com/iberianpig))
-- Update rake requirement from ~\> 12.3 to ~\> 13.0 [\#136](https://github.com/iberianpig/fusuma/pull/136) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 
 ## [v1.2.1](https://github.com/iberianpig/fusuma/tree/v1.2.1) (2019-10-19)
 
@@ -81,6 +84,7 @@
 
 **Merged pull requests:**
 
+- Update rake requirement from ~\> 12.3 to ~\> 13.0 [\#136](https://github.com/iberianpig/fusuma/pull/136) ([dependabot-preview[bot]](https://github.com/apps/dependabot-preview))
 - Fixed Spelling mistake [\#128](https://github.com/iberianpig/fusuma/pull/128) ([thomascrha](https://github.com/thomascrha))
 - \[Readme\] Added step to install Ruby [\#127](https://github.com/iberianpig/fusuma/pull/127) ([mmoraes-rafael](https://github.com/mmoraes-rafael))
 - Plugin Based Architecture [\#116](https://github.com/iberianpig/fusuma/pull/116) ([iberianpig](https://github.com/iberianpig))

data/lib/fusuma.rb

@@ -33,8 +33,11 @@ module Fusuma
         Plugin::Manager.require_plugins_from_relative
         Plugin::Manager.require_plugins_from_config
 
+        MultiLogger.info '---------------------------------------------'
         print_version
+        MultiLogger.info '---------------------------------------------'
         print_enabled_plugins
+        MultiLogger.info '---------------------------------------------'
         Kernel.exit(0) if option[:version]
 
         print_device_list if option[:list]
@@ -44,23 +47,19 @@ module Fusuma
       end
 
       def print_version
-        MultiLogger.info '---------------------------------------------'
         MultiLogger.info "Fusuma: #{Fusuma::VERSION}"
         MultiLogger.info "libinput: #{Plugin::Inputs::LibinputCommandInput.new.version}"
         MultiLogger.info "OS: #{`uname -rsv`}".strip
         MultiLogger.info "Distribution: #{`cat /etc/issue`}".strip
         MultiLogger.info "Desktop session: #{`echo $DESKTOP_SESSION $XDG_SESSION_TYPE`}".strip
-        MultiLogger.info '---------------------------------------------'
       end
 
       def print_enabled_plugins
-        MultiLogger.info '---------------------------------------------'
         MultiLogger.info 'Enabled Plugins: '
         Plugin::Manager.plugins
                        .reject { |k, _v| k.to_s =~ /Base/ }
                        .map { |_base, plugins| plugins.map { |plugin| "  #{plugin}" } }
                        .flatten.sort.each { |name| MultiLogger.info(name) }
-        MultiLogger.info '---------------------------------------------'
       end
 
       def print_device_list
@@ -87,6 +86,7 @@ module Fusuma
     def run
       # TODO: run with multi thread
       @inputs.first.run do |event|
+        clear_expired
         filtered = filter(event)
         parsed = parse(filtered)
         buffered = buffer(parsed)
@@ -111,11 +111,9 @@ module Fusuma
     # @param buffers [Array<Buffer>]
     # @return [Array<Event>]
     def detect(buffers)
-      @detectors.reduce([]) do |detected, detector|
+      @detectors.each_with_object([]) do |detector, detected|
         if (event = detector.detect(buffers))
           detected << event
-        else
-          detected
         end
       end
     end
@@ -140,5 +138,9 @@ module Fusuma
 
       executor&.execute(event)
     end
+
+    def clear_expired
+      @buffers.each(&:clear_expired)
+    end
   end
 end

data/lib/fusuma/plugin/buffers/buffer.rb

@@ -25,6 +25,10 @@ module Fusuma
           @events.push(event)
         end
 
+        # clear old events
+        # @param current_time [Time]
+        def clear_expired(current_time: Time.now); end
+
         # clear buffer
         def clear
           @events.clear

data/lib/fusuma/plugin/buffers/gesture_buffer.rb

@@ -25,12 +25,21 @@ module Fusuma
           # - other event buffer
           return if event&.tag != source
 
-          delete_old_events
-
           @events.push(event)
           clear unless updating?
         end
 
+        def clear_expired(current_time: Time.now)
+          @seconds_to_keep ||= (config_params(:seconds_to_keep) || DEFAULT_SECONDS_TO_KEEP)
+          @events.each do |e|
+            break if current_time - e.time < @seconds_to_keep
+
+            MultiLogger.debug("#{self.class.name}##{__method__}")
+
+            @events.delete(e)
+          end
+        end
+
         # @param attr [Symbol]
         # @return [Float]
         def sum_attrs(attr)
@@ -70,16 +79,6 @@ module Fusuma
 
         private
 
-        # Delete old events pushed before 0.1sec
-        def delete_old_events
-          @seconds_to_keep ||= (config_params(:seconds_to_keep) || DEFAULT_SECONDS_TO_KEEP)
-          @events.each do |e|
-            break if Time.now - e.time < @seconds_to_keep
-
-            @events.delete(e)
-          end
-        end
-
         def updating?
           return true unless @events.last.record.status =~ /begin|end/
         end

data/lib/fusuma/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fusuma
-  VERSION = '1.4.1'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fusuma
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - iberianpig
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler