alexandria-book-collection-manager 0.7.9 → 0.7.11

data/lib/alexandria/ui/new_book_dialog_manual.rb

@@ -12,15 +12,16 @@ module Alexandria
     class NewBookDialogManual < BookPropertiesDialogBase
       include GetText
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
-      TMP_COVER_FILE = File.join(Dir.tmpdir, "tmp_cover")
       def initialize(parent, library, &on_add_cb)
-        super(parent, TMP_COVER_FILE)
+        tmp_cover_file = File.join(Dir.mktmpdir("cover"), "tmp_cover")
+        super(parent, tmp_cover_file)
 
         @library = library
         @on_add_cb = on_add_cb
-        FileUtils.rm_f(TMP_COVER_FILE)
+        FileUtils.rm_f(@cover_file)
 
         cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
         cancel_button.signal_connect("clicked") { on_cancel }
@@ -89,8 +90,7 @@ module Alexandria
           raise AddError, _("A binding must be provided.")
         end
 
-        authors = []
-        @treeview_authors.model.each { |_m, _p, i| authors << i[0] }
+        authors = @treeview_authors.model.map { |_m, _p, i| i[0] }
         if authors.empty?
           raise AddError, _("At least one author must be " \
                             "provided.")
@@ -110,8 +110,8 @@ module Alexandria
         book.tags = @entry_tags.text.split
         @library << book
         @library.save(book)
-        if File.exist?(TMP_COVER_FILE) && !@delete_cover_file
-          FileUtils.cp(TMP_COVER_FILE, @library.cover(book))
+        if File.exist?(@cover_file) && !@delete_cover_file
+          FileUtils.cp(@cover_file, @library.cover(book))
         end
         @on_add_cb.call(book)
         @book_properties_dialog.destroy

data/lib/alexandria/ui/new_provider_dialog.rb

@@ -10,6 +10,7 @@ module Alexandria
   module UI
     class NewProviderDialog < ProviderPreferencesBaseDialog
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent)

data/lib/alexandria/ui/new_smart_library_dialog.rb

@@ -8,10 +8,11 @@ module Alexandria
   module UI
     class NewSmartLibraryDialog < SmartLibraryPropertiesDialogBase
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent)
-        super(parent)
+        super
 
         dialog.add_buttons([Gtk::Stock::CANCEL, :cancel],
                            [Gtk::Stock::NEW, :ok])

data/lib/alexandria/ui/preferences_dialog.rb

@@ -5,7 +5,7 @@
 # See the file README.md for authorship and licensing information.
 
 require "alexandria/scanners/cue_cat"
-require "alexandria/scanners/keyboard"
+require "alexandria/scanners/keyboard_wedge"
 require "alexandria/ui/builder_base"
 require "alexandria/ui/provider_preferences_dialog"
 require "alexandria/ui/new_provider_dialog"
@@ -15,6 +15,7 @@ module Alexandria
     class PreferencesDialog < BuilderBase
       include Logging
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, &changed_block)
@@ -301,9 +302,8 @@ module Alexandria
       end
 
       def update_priority
-        priority = []
-        @treeview_providers.model.each do |_model, _path, iter|
-          priority << iter[1]
+        priority = @treeview_providers.model.map do |_model, _path, iter|
+          iter[1]
         end
         Preferences.instance.providers_priority = priority
         BookProviders.instance.update_priority

data/lib/alexandria/ui/provider_preferences_dialog.rb

@@ -10,6 +10,7 @@ module Alexandria
   module UI
     class ProviderPreferencesDialog < ProviderPreferencesBaseDialog
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, provider)

data/lib/alexandria/ui/really_delete_dialog.rb

@@ -10,6 +10,7 @@ module Alexandria
   module UI
     class ReallyDeleteDialog < AlertDialog
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, library, books = nil)

data/lib/alexandria/ui/sidepane_manager.rb

@@ -11,6 +11,7 @@ module Alexandria
     class SidepaneManager
       include Logging
       include GetText
+
       attr_accessor :library_listview
 
       def initialize(library_listview, parent)
@@ -50,7 +51,7 @@ module Alexandria
 
         if (match = contains_illegal_character(new_text))
           if match.instance_of? MatchData
-            chars = match[1].gsub(/&/, "&")
+            chars = match[1].gsub("&", "&")
             ErrorDialog.new(@main_app, _("Invalid library name '%s'") % new_text,
                             _("The name provided contains the " \
                               "disallowed character <b>%s</b>") % chars).display
@@ -128,71 +129,71 @@ module Alexandria
 
         @library_listview
           .signal_connect("drag-motion") do |_widget, drag_context, x, y, time, _data|
-          log.debug { "drag-motion" }
-
-          path, column, =
-            @library_listview.get_path_at_pos(x, y)
-
-          if path
-            # Refuse drags from/to smart libraries.
-            if @parent.selected_library.is_a?(SmartLibrary)
-              path = nil
-            else
-              iter = @library_listview.model.get_iter(path)
-              if iter[3] # separator?
+            log.debug { "drag-motion" }
+
+            path, column, =
+              @library_listview.get_path_at_pos(x, y)
+
+            if path
+              # Refuse drags from/to smart libraries.
+              if @parent.selected_library.is_a?(SmartLibrary)
                 path = nil
               else
-                library = @libraries.all_libraries.find do |lib|
-                  lib.name == iter[1]
+                iter = @library_listview.model.get_iter(path)
+                if iter[3] # separator?
+                  path = nil
+                else
+                  library = @libraries.all_libraries.find do |lib|
+                    lib.name == iter[1]
+                  end
+                  path = nil if library.is_a?(SmartLibrary)
                 end
-                path = nil if library.is_a?(SmartLibrary)
               end
             end
-          end
 
-          @library_listview.set_drag_dest_row(path, :into_or_after)
+            @library_listview.set_drag_dest_row(path, :into_or_after)
 
-          Gdk.drag_status(drag_context,
-                          path ? drag_context.suggested_action : 0,
-                          time)
+            Gdk.drag_status(drag_context,
+                            path ? drag_context.suggested_action : 0,
+                            time)
         end
 
         @library_listview
           .signal_connect("drag-drop") do |widget, drag_context, _x, _y, time, _data|
-          log.debug { "drag-drop" }
+            log.debug { "drag-drop" }
 
-          widget.drag_get_data(drag_context,
-                               drag_context.targets.first,
-                               time)
-          true
+            widget.drag_get_data(drag_context,
+                                 drag_context.targets.first,
+                                 time)
+            true
         end
 
         @library_listview
           .signal_connect("drag-data-received") do |_, drag_context, x, y, data, _, _|
-          log.debug { "drag-data-received" }
-
-          success = false
-          # FIXME: Ruby-GNOME2 should make comparison work without needing to
-          # call #name.
-          if data.data_type.name == Gdk::Selection::TYPE_STRING.name
-            success, path =
-              @library_listview.get_dest_row_at_pos(x, y)
-
-            if success
-              iter = @library_listview.model.get_iter(path)
-              library = @libraries.all_libraries.find do |lib|
-                lib.name == iter[1]
+            log.debug { "drag-data-received" }
+
+            success = false
+            # FIXME: Ruby-GNOME2 should make comparison work without needing to
+            # call #name.
+            if data.data_type.name == Gdk::Selection::TYPE_STRING.name
+              success, path =
+                @library_listview.get_dest_row_at_pos(x, y)
+
+              if success
+                iter = @library_listview.model.get_iter(path)
+                library = @libraries.all_libraries.find do |lib|
+                  lib.name == iter[1]
+                end
+                @parent.move_selected_books_to_library(library)
+                success = true
               end
-              @parent.move_selected_books_to_library(library)
-              success = true
             end
-          end
-          begin
-            drag_context.finish(success: success, delete: false)
-          rescue StandardError => ex
-            log.error { "drag_context.finish failed: #{ex}" }
-            raise
-          end
+            begin
+              drag_context.finish(success: success, delete: false)
+            rescue StandardError => ex
+              log.error { "drag_context.finish failed: #{ex}" }
+              raise
+            end
         end
       end
     end

data/lib/alexandria/ui/skip_entry_dialog.rb

@@ -11,6 +11,7 @@ module Alexandria
     class SkipEntryDialog < AlertDialog
       include GetText
       include Logging
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, message)

data/lib/alexandria/ui/smart_library_properties_dialog.rb

@@ -8,6 +8,7 @@ module Alexandria
   module UI
     class SmartLibraryPropertiesDialog < SmartLibraryPropertiesDialogBase
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, smart_library)

data/lib/alexandria/ui/smart_library_properties_dialog_base.rb

@@ -13,6 +13,7 @@ module Alexandria
       include Logging
       include CalendarPopup
       include GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       attr_reader :predicate_operator_rule, :dialog
@@ -77,7 +78,7 @@ module Alexandria
         new_rule.value = nil
       end
 
-      protected
+      private
 
       attr_reader :smart_library_rules
 

data/lib/alexandria/ui/{sound.rb → sound_effects_player.rb}

@@ -28,7 +28,10 @@ module Alexandria
   module UI
     ## Uses Ruby/GStreamer to play Ogg/Vorbis sound effects
     class SoundEffectsPlayer
+      include Logging
+
       def initialize
+        log.info { "Setting up SoundEffectsPlayer" }
         @sounds_dir = Alexandria::Config::SOUNDS_DIR
         @ogg_vorbis_pipeline = Gst::Pipeline.new
         set_up_pipeline