audio_switch 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af9711a69f38a1d0acde23d905ea0b2fca26e18cc59ff146789abd8a9da8a3a4
-  data.tar.gz: 99d936b452f40bf8b26f64112696898ef4a0cf067852d52647aaf61cd0b8a786
+  metadata.gz: 960ca345220ec6a6ff42cf1bcf1181924a8184b8219c54b1eadd96261c521850
+  data.tar.gz: a738239dc085e95e34044c85e30e2dbdbc6dd4c93399547af7db52ca891c93ad
 SHA512:
-  metadata.gz: 5a06027f3094765b3ec3c754716e26a7a27ce7aff275f869ae32023c3fd87bd1a8f0e4e79d16ef9bfd82a60220932e130a5d12e850b32b2ee2431c26ee9d047e
-  data.tar.gz: d44167c4c067265bff69bd3c4ae7112462c0e69b1956c18c8d5e4560df39dae07c9b6151ff385a0bd7c84cafafc66b0e1298c22a7ad03a93a3d02abf4864f62b
+  metadata.gz: c70f44be01ad095ec634bb56fafda14ce255850d3084247bf48ecea7380632a3b9c6750ec9ef9a6480095563a17a3b2eb60309ef1b4b62b835d068415574bd5c
+  data.tar.gz: '09973aa3ffa18731f15aaddd7f53673a023414189867eea2e71d73489f0d4392914b35e312434e5fd9a20878727424d0895b051abf2aa5e92fd1c4b996061594'

data/bin/audio_switch

@@ -1,9 +1,10 @@
 #!/usr/bin/env ruby
-require 'audio_switch'
+require_relative '../lib/audio_switch'
 
 begin
-  puts "audio_switch version #{AudioSwitch::VERSION}"
   AudioSwitch::App.start
 rescue Interrupt
-  puts "\nexit"
+  AudioSwitch::LOG.info('exit')
+rescue StandardError => e
+  AudioSwitch::LOG.error('uncaught') { e }
 end

data/lib/app_logger.rb

@@ -0,0 +1,9 @@
+module AudioSwitch
+  def self.configure_logger
+    log_path = "#{Dir.home}/.audio_switch"
+    Dir.mkdir(log_path) unless Dir.exist?(log_path)
+    log = Logger.new("#{log_path}/audio_switch.log", 'daily')
+    log.level = Logger::INFO
+    log
+  end
+end

data/lib/audio_switch.rb

@@ -1,15 +1,25 @@
+require 'logger'
+require_relative 'app_logger.rb'
 require_relative 'audio_switch/pactl.rb'
 require_relative 'audio_switch/model.rb'
 require_relative 'audio_switch/ui.rb'
 require_relative 'audio_switch/version.rb'
 
 module AudioSwitch
+  LOG = configure_logger
+
   module App
     def self.start
+      AudioSwitch::LOG.info("starting audio_switch #{AudioSwitch::VERSION} on ruby #{RUBY_VERSION}")
       pactl = AudioSwitch::Pactl.new
       model = AudioSwitch::Model.new(pactl)
       ui = AudioSwitch::UI.new(model)
       ui.start
     end
+
+    def self.quit
+      AudioSwitch::LOG.info('quitting audio_switch')
+      exit
+    end
   end
 end

data/lib/audio_switch/model.rb

@@ -14,6 +14,7 @@ module AudioSwitch
     end
 
     def select_sink(sink_id)
+      AudioSwitch::LOG.info "selecting sink '#{sink_id}'"
       @pactl.default_sink = sink_id
       @pactl.inputs.each do |input|
         @pactl.move_input(input[:id], sink_id)
@@ -25,12 +26,11 @@ module AudioSwitch
     end
 
     def rtp_on?
-      return false unless @pactl.sinks.any? { |sink| sink[:name] == RTP }
-      return false unless @pactl.modules.any? { |mod| mod[:name] == MODULE_RTP_SEND }
-      true
+      @pactl.sinks.any? { |sink| sink[:name] == RTP }
     end
 
     def rtp_on
+      AudioSwitch::LOG.info 'turning RTP on'
       # prevent positive feedback loop
       mute_sources
       # see https://cgit.freedesktop.org/pulseaudio/paprefs/tree/src/paprefs.cc
@@ -51,17 +51,20 @@ module AudioSwitch
     end
 
     def rtp_off
+      AudioSwitch::LOG.info 'turning RTP off'
       @pactl.unload_module(MODULE_RTP_SEND)
       @pactl.unload_module(MODULE_NULL_SINK)
     end
 
     def mute_sources
+      AudioSwitch::LOG.info 'muting all sources'
       sources.each do |source|
         @pactl.mute_source(source[:id])
       end
     end
 
     def unmute_sources
+      AudioSwitch::LOG.info 'unmuting all sources'
       sources.each do |source|
         @pactl.unmute_source(source[:id])
       end
@@ -74,7 +77,7 @@ module AudioSwitch
     private
 
     def sources
-      @pactl.sources.select { |source| source[:name] != 'rtp.monitor' }
+      @pactl.sources.reject { |source| source[:name] == 'rtp.monitor' }
     end
 
     def handle(event, block)

data/lib/audio_switch/pactl.rb

@@ -3,10 +3,12 @@ require 'pty'
 module AudioSwitch
   class Pactl
     def move_input(input_id, sink_id)
+      AudioSwitch::LOG.info "moving sink input '#{input_id}' to sink '#{sink_id}'"
       `pactl move-sink-input #{input_id} #{sink_id}`
     end
 
     def default_sink=(sink_id)
+      AudioSwitch::LOG.info "setting default sink to '#{sink_id}'"
       # pactl doesn't have this command
       `pacmd set-default-sink #{sink_id}`
     end
@@ -29,31 +31,36 @@ module AudioSwitch
     end
 
     def load_module(mod, options = {})
+      AudioSwitch::LOG.info "loading module '#{mod}' with options '#{options}'"
       `pactl load-module #{mod} #{ModuleOptions.new(options)}`
     end
 
     def unload_module(mod)
+      AudioSwitch::LOG.info "unloading module '#{mod}'"
       `pactl unload-module #{mod}`
     end
 
     def subscribe(command = 'pactl subscribe')
       Thread.start do
+        AudioSwitch::LOG.info "starting '#{command}'"
         @pactl_sub = PTY.spawn(command)[0]
         begin
           @pactl_sub.each do |line|
             yield(Out.new(line).parse_event)
           end
-        rescue Errno::EIO, IOError
-          return
+        rescue Errno::EIO, IOError => e
+          AudioSwitch::LOG.error("reading '#{command}' output") { e }
         end
       end
     end
 
     def mute_source(source_id)
+      AudioSwitch::LOG.info "muting source '#{source_id}'"
       `pactl set-source-mute #{source_id} true`
     end
 
     def unmute_source(source_id)
+      AudioSwitch::LOG.info "unmuting source '#{source_id}'"
       `pactl set-source-mute #{source_id} false`
     end
 
@@ -116,7 +123,7 @@ module AudioSwitch
           field = fields[field_id]
           next unless line =~ Regexp.new(field[:marker])
 
-          object = {} if field_id == 0
+          object = {} if field_id.zero?
           update(object, line, field)
 
           field_id += 1

data/lib/audio_switch/ui.rb

@@ -12,7 +12,11 @@ module AudioSwitch
     def start
       add_to_tray
       subscribe
-      Gtk.main
+      AudioSwitch::LOG.info 'starting GTK main'
+      loop do
+        Gtk.main
+        AudioSwitch::LOG.info 'restarting GTK main'
+      end
     end
 
     private
@@ -33,10 +37,14 @@ module AudioSwitch
 
     def draw(sinks)
       clear
-      sinks.each { |sink| add new_item(sink) }
+      sinks
+        .sort_by { |sink| sink[:description] }
+        .each { |sink| add new_item(sink) }
       add new_separator
       add new_rtp_toggle
       add new_mute_toggle
+      add new_separator
+      add new_quit_item
     end
 
     def add(item)
@@ -81,6 +89,14 @@ module AudioSwitch
       toggle
     end
 
+    def new_quit_item
+      item = Gtk::MenuItem.new('Quit')
+      item.signal_connect('activate') do
+        AudioSwitch::App.quit
+      end
+      item
+    end
+
     def new_separator
       Gtk::SeparatorMenuItem.new
     end

data/lib/audio_switch/version.rb

@@ -1,3 +1,3 @@
 module AudioSwitch
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: audio_switch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - Anatolii Saienko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-30 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.6
+        version: 3.4.3
 - !ruby/object:Gem::Dependency
   name: ruby-libappindicator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.5
 - !ruby/object:Gem::Dependency
@@ -58,56 +58,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.2'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 0.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
-  name: rspec-wait
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.75.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.75.1
+- !ruby/object:Gem::Dependency
+  name: solargraph
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ubuntu applet that lets you switch audio sinks, toggle RTP sender and
   inputs. Depends on PulseAudio and libappindicator-dev.
 email:
@@ -118,6 +132,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/audio_switch
+- lib/app_logger.rb
 - lib/audio_switch.rb
 - lib/audio_switch/model.rb
 - lib/audio_switch/pactl.rb