alexandria-book-collection-manager 0.7.9 → 0.7.11

data/lib/alexandria/ui/acquire_dialog.rb

@@ -9,20 +9,18 @@ require "monitor"
 require "alexandria/image_fetcher"
 
 require "alexandria/scanners/cue_cat"
-require "alexandria/scanners/keyboard"
+require "alexandria/scanners/keyboard_wedge"
 
 require "alexandria/ui/builder_base"
 require "alexandria/ui/barcode_animation"
 require "alexandria/ui/error_dialog"
-require "alexandria/ui/sound"
+require "alexandria/ui/sound_effects_player"
 
 module Alexandria
   module UI
     # assists in turning on progress bar when searching
     # and turning it off when all search threads have completed...
-    class SearchThreadCounter < Monitor
-      attr_reader :count
-
+    class SearchThreadMonitor < Monitor
       def initialize
         @count = 0
         super
@@ -39,6 +37,14 @@ module Alexandria
           @count -= 1 unless @count.zero?
         end
       end
+
+      def any?
+        @count > 0
+      end
+
+      def none?
+        @count.zero?
+      end
     end
 
     class AcquireDialog < BuilderBase
@@ -46,10 +52,12 @@ module Alexandria
       include ImageFetcher
       include Logging
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
-      def initialize(parent, selected_library = nil, &block)
+      def initialize(parent, ui_manager, selected_library, &block)
         super("acquire_dialog__builder.glade", widget_names)
+        @ui_manager = ui_manager
         @acquire_dialog.transient_for = @parent = parent
         @block = block
 
@@ -64,8 +72,8 @@ module Alexandria
         init_treeview
         @book_results = {}
 
-        @search_thread_counter = SearchThreadCounter.new
-        @search_threads_running = @search_thread_counter.new_cond
+        @search_thread_monitor = SearchThreadMonitor.new
+        @search_threads_running = @search_thread_monitor.new_cond
       end
 
       def show
@@ -79,8 +87,9 @@ module Alexandria
 
       def book_in_library(isbn10, library)
         isbn13 = Library.canonicalise_ean(isbn10)
+        isbns = [isbn10, isbn13]
         match = library.find do |book|
-          (book.isbn == isbn10 || book.isbn == isbn13)
+          isbns.include?(book.isbn)
         end
         !match.nil?
       rescue StandardError
@@ -258,28 +267,11 @@ module Alexandria
       # begin copy-n-paste from new_book_dialog
 
       def notify_start_add_by_isbn
-        GLib::Idle.add do
-          main_progress_bar = MainApp.instance.appbar.children.first
-          main_progress_bar.visible = true
-          @progress_pulsing = GLib::Timeout.add(100) do
-            if @destroyed
-              @progress_pulsing = nil
-              false
-            else
-              main_progress_bar.pulse
-              true
-            end
-          end
-          false
-        end
+        ui_manager.start_progress_bar_pulsing(self)
       end
 
       def notify_end_add_by_isbn
-        GLib::Idle.add do
-          MainApp.instance.appbar.children.first.visible = false
-          GLib::Source.remove(@progress_pulsing) if @progress_pulsing
-          false
-        end
+        ui_manager.stop_progress_bar_pulsing
       end
 
       def update(status, provider)
@@ -292,28 +284,34 @@ module Alexandria
           }
           message = messages[status] % provider
           log.debug { "update message : #{message}" }
-          MainApp.instance.ui_manager.set_status_label(message)
+          ui_manager.set_status_label(message)
           false
         end
       end
 
+      def destroyed?
+        @acquire_dialog.destroyed?
+      end
+
       # end copy-n-paste
 
+      attr_reader :ui_manager
+
       private
 
       def start_search
-        @search_thread_counter.synchronize do
-          first_search = @search_thread_counter.count.zero?
+        @search_thread_monitor.synchronize do
+          first_search = @search_thread_monitor.none?
 
-          @search_thread_counter.new_search
+          @search_thread_monitor.new_search
 
           if first_search
             @progress_bar_thread = Thread.new do
               notify_start_add_by_isbn
               Alexandria::BookProviders.instance.add_observer(self)
-              @search_thread_counter.synchronize do
+              @search_thread_monitor.synchronize do
                 @search_threads_running.wait_while do
-                  @search_thread_counter.count > 0
+                  @search_thread_monitor.any?
                 end
               end
               notify_end_add_by_isbn
@@ -324,8 +322,8 @@ module Alexandria
       end
 
       def stop_search
-        @search_thread_counter.synchronize do
-          @search_thread_counter.end_search
+        @search_thread_monitor.synchronize do
+          @search_thread_monitor.end_search
           @search_threads_running.signal
         end
       end
@@ -386,7 +384,7 @@ module Alexandria
       end
 
       def on_destroy
-        MainApp.instance.ui_manager.set_status_label("")
+        ui_manager.set_status_label("")
         notify_end_add_by_isbn
         # TODO: possibly make sure all threads have stopped running
         @animation.destroy
@@ -401,7 +399,7 @@ module Alexandria
 
         log.debug { "Using #{@scanner.name} scanner" }
         message = _("Ready to use %s barcode scanner") % @scanner.name
-        MainApp.instance.ui_manager.set_status_label(message)
+        ui_manager.set_status_label(message)
 
         @prev_time = 0
         @interval = 0
@@ -497,11 +495,6 @@ module Alexandria
           end
         end
 
-        # @sound_player = SoundEffectsPlayer.new
-        @sound_players = {}
-        @sound_players["scanning"] = SoundEffectsPlayer.new
-        @sound_players["good_scan"] = SoundEffectsPlayer.new
-        @sound_players["bad_scan"] = SoundEffectsPlayer.new
         @test_scan = false
       end
 
@@ -510,16 +503,20 @@ module Alexandria
           log.debug { "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" }
           return unless @prefs.play_scanning_sound
 
-          @sound_players["scanning"].play("scanning")
+          sound_player.play("scanning")
         else
           log.debug { "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" }
           return unless @prefs.play_scan_sound
 
           # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
-          @sound_players[effect].play(effect)
+          sound_player.play(effect)
         end
       end
 
+      def sound_player
+        @sound_player ||= SoundEffectsPlayer.new
+      end
+
       def developer_test_scan
         log.info { "Developer test scan" }
         scans = [".C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3j3C3f1Dxj3Dq.",

data/lib/alexandria/ui/alert_dialog.rb

@@ -4,7 +4,7 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require "cgi"
+require "cgi/escape"
 
 module Alexandria
   module UI
@@ -34,6 +34,8 @@ module Alexandria
         @dialog.child.pack_start(hbox)
       end
 
+      attr_reader :dialog
+
       def show_all
         dialog.show_all
       end
@@ -52,8 +54,6 @@ module Alexandria
 
       private
 
-      attr_reader :dialog
-
       def make_label(markup)
         label = Gtk::Label.new
         label.set_alignment(0, 0)

data/lib/alexandria/ui/barcode_animation.rb

@@ -143,9 +143,9 @@ module Alexandria
       def scan_animation
         if @index < @barcode_bars.size
           @index = 0 if @index < 0
-          alpha = 7 * (@index + 1)
+          alpha = (@index + 1) * 7
           @barcode_bars.each_with_index do |rect, i|
-            rect.set_property(:fill_color_rgba, 0xFF000000 + alpha)
+            rect.set_property(:fill_color_rgba, alpha + 0xFF000000)
             break if i >= @index
           end
           @index += 1
@@ -166,7 +166,7 @@ module Alexandria
       def fade_animation
         @fade_opacity = 255 if @fade_opacity == -1
         if @fade_opacity >= 0
-          grey = 0x00000000 + @fade_opacity
+          grey = @fade_opacity + 0x00000000
           @barcode_bars.each { |rect| rect.set_property(:fill_color_rgba, grey) }
           @fade_opacity -= 5
         else

data/lib/alexandria/ui/book_properties_dialog.rb

@@ -11,6 +11,7 @@ module Alexandria
     class BookPropertiesDialog < BookPropertiesDialogBase
       include GetText
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, library, book)
@@ -82,17 +83,16 @@ module Alexandria
         end
 
         @checkbutton_own.active = book.own?
-        if (@checkbutton_redd.active = book.redd?)
-          @redd_date.sensitive = true
-          if book.redd_when.nil?
-            log.debug { "no redd_when" }
-          else
-            @redd_date.text = format_date(book.redd_when)
-          end
-          # self.redd_when = (book.redd_when or Time.now)
+
+        @block_calendar_popup = true
+        if book.redd?
+          @redd_date.text = format_date(book.redd_when) unless book.redd_when.nil?
+          @checkbutton_redd.active = true
         else
-          @redd_date.sensitive = false
+          @checkbutton_redd.active = false
         end
+        @block_calendar_popup = false
+
         @checkbutton_want.active = book.want?
 
         @checkbutton_want.inconsistent = true if (@checkbutton_own.active = book.own?)

data/lib/alexandria/ui/book_properties_dialog_base.rb

@@ -15,6 +15,7 @@ module Alexandria
       include Logging
       include GetText
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       COVER_MAXWIDTH = 140 # pixels
@@ -55,11 +56,7 @@ module Alexandria
         @treeview_authors.append_column(col)
 
         setup_date_widgets
-        GLib::Timeout.add(150) do
-          @setup_finished = true
-
-          false
-        end
+        @block_calendar_popup = false
       end
 
       def show
@@ -151,7 +148,7 @@ module Alexandria
 
       def want_toggled; end
 
-      @@latest_filechooser_directory = ENV["HOME"]
+      @@latest_filechooser_directory = Dir.home
       def on_change_cover
         dialog = Gtk::FileChooserDialog.new(title: _("Select a cover image"),
                                             parent: @book_properties_dialog,
@@ -177,8 +174,8 @@ module Alexandria
               FileUtils.cp(dialog.filename, "#{@cover_file}.orig")
               new_width = cover.width / (cover.height / COVER_ABSOLUTE_MAXHEIGHT.to_f)
               log.info do
-                "Scaling large cover image to" \
-                  " #{new_width.to_i} x #{COVER_ABSOLUTE_MAXHEIGHT}"
+                "Scaling large cover image to " \
+                  "#{new_width.to_i} x #{COVER_ABSOLUTE_MAXHEIGHT}"
               end
               cover = cover.scale(new_width.to_i, COVER_ABSOLUTE_MAXHEIGHT)
               cover.save(@cover_file, "jpeg")
@@ -242,13 +239,15 @@ module Alexandria
       end
 
       def redd_toggled
-        redd_yes = @checkbutton_redd.active?
-        @redd_date.sensitive = redd_yes
+        if @checkbutton_redd.active?
+          @redd_date.sensitive = true
 
-        return unless redd_yes && @redd_date.text.strip.empty?
+          return if @block_calendar_popup
 
-        # don't do this when popping up the dialog for the first time
-        display_calendar_popup(@redd_date) if @setup_finished
+          display_calendar_popup(@redd_date) if @redd_date.text.strip.empty?
+        else
+          @redd_date.sensitive = false
+        end
       end
 
       private
@@ -263,7 +262,7 @@ module Alexandria
         ]
         raise _("out of range") if rating < 0 || rating > images.length
 
-        images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
+        images[0..(rating - 1)].each { |x| x.pixbuf = Icons::STAR_SET }
         images[rating..].each { |x| x.pixbuf = Icons::STAR_UNSET }
         @current_rating = rating
       end

data/lib/alexandria/ui/builder_base.rb

@@ -17,7 +17,7 @@ module Alexandria
           method(handler)
         end
         widget_names.each do |name|
-          instance_variable_set("@#{name}".intern, builder[name.to_s])
+          instance_variable_set(:"@#{name}", builder[name.to_s])
         end
       end
     end

data/lib/alexandria/ui/callbacks.rb

@@ -31,7 +31,8 @@ module Alexandria
 
       def on_add_book(*)
         log.info { "on_add_book" }
-        dialog = NewBookDialog.new(@main_app, selected_library) do |_books, library, is_new|
+        dialog = NewBookDialog.new(@main_app, self, selected_library) do
+          |_books, library, is_new|
           if is_new
             append_library(library, true)
             setup_move_actions
@@ -115,7 +116,7 @@ module Alexandria
 
       def on_acquire(*)
         dialog =
-          AcquireDialog.new(@main_app, selected_library) do |_books, library, is_new|
+          AcquireDialog.new(@main_app, self, selected_library) do |_books, library, is_new|
             if is_new
               append_library(library, true)
               setup_move_actions
@@ -313,11 +314,11 @@ module Alexandria
       def connect_toggle_actions
         toggle_actions
           .each do |name, stock_id, label, accelerator, tooltip, callback, is_active|
-          action = Gtk::ToggleAction.new(name, label: label, tooltip: tooltip,
-                                         stock_id: stock_id)
-          action.set_active is_active
-          @actiongroup.add_action_with_accel(action, accelerator)
-          action.signal_connect("toggled", &callback) if callback
+            action = Gtk::ToggleAction.new(name, label: label, tooltip: tooltip,
+                                           stock_id: stock_id)
+            action.set_active is_active
+            @actiongroup.add_action_with_accel(action, accelerator)
+            action.signal_connect("toggled", &callback) if callback
         end
       end
 

data/lib/alexandria/ui/confirm_erase_dialog.rb

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

data/lib/alexandria/ui/conflict_while_copying_dialog.rb

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

data/lib/alexandria/ui/export_dialog.rb

@@ -13,6 +13,7 @@ module Alexandria
     class ExportDialog
       include GetText
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       FORMATS = Alexandria::ExportFormat.all

data/lib/alexandria/ui/{iconview.rb → icon_view_manager.rb}

@@ -29,6 +29,7 @@ module Alexandria
       include Logging
       include GetText
       include DragAndDropable
+
       def initialize(_iconview, parent)
         @parent = parent
         @iconview = @parent.iconview

data/lib/alexandria/ui/icons.rb

@@ -35,8 +35,8 @@ module Alexandria
           return GdkPixbuf::Pixbuf.new(file: filename) if File.exist?(filename)
         rescue GdkPixbuf::PixbufError
           log.error do
-            "Failed to load GdkPixbuf::Pixbuf," \
-              " please ensure that #{filename} is a valid image file"
+            "Failed to load GdkPixbuf::Pixbuf, " \
+              "please ensure that #{filename} is a valid image file"
           end
         end
         BOOK_ICON

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -12,7 +12,7 @@
 #
 # Ported to ruby-gtk2 (and modified for IconView) by Cathal Mc Ginley
 
-require "cgi"
+require "cgi/escape"
 
 module Alexandria
   module UI

data/lib/alexandria/ui/init.rb

@@ -25,22 +25,28 @@ class Gtk::ActionGroup
 end
 
 module Alexandria::UI::FreezeThaw
+  def self.included(base)
+    base.class_eval do
+      attr_accessor :old_model
+    end
+  end
+
   def frozen?
-    @old_model && !model
+    old_model && !model
   end
 
   def freeze
     return if frozen?
 
-    @old_model = model
+    self.old_model = model
     self.model = nil
   end
 
   def unfreeze
     return unless frozen?
 
-    self.model = @old_model
-    @old_model = nil
+    self.model = old_model
+    self.old_model = nil
   end
 end
 

data/lib/alexandria/ui/keep_bad_isbn_dialog.rb

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

data/lib/alexandria/ui/libraries_combo.rb

@@ -24,6 +24,7 @@ module Alexandria
   module ComboBoxOverrides
     include GetText
     extend GetText
+
     GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def populate_with_libraries(libraries, selected_library)

data/lib/alexandria/ui/listview.rb

@@ -10,11 +10,13 @@ module Alexandria
   module UI
     include Logging
     include GetText
+
     GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
     class ListViewManager
       include Logging
       include GetText
       include DragAndDropable
+
       BOOKS_TARGET_TABLE = [["ALEXANDRIA_BOOKS", :same_app, 0]].freeze
 
       def initialize(_listview, parent)

data/lib/alexandria/ui/main_app.rb

@@ -37,19 +37,21 @@ require "alexandria/ui/dndable"
 require "alexandria/ui/init"
 require "alexandria/ui/ui_manager"
 require "alexandria/ui/listview"
-require "alexandria/ui/iconview"
+require "alexandria/ui/icon_view_manager"
 require "alexandria/ui/sidepane_manager"
 
 module Alexandria
   module UI
     include Logging
     include GetText
+
     GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     class MainApp
       include Logging
       include GetText
       include Singleton
+
       attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs, :ui_manager
 
       def initialize

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -79,8 +79,6 @@ module Alexandria
     def motion_notify_event(event)
       if drag_check_threshold(@context.x, @context.y, event.x, event.y)
         stop_drag_check
-        paths = []
-        selection.each { |_model, path, _iter| paths << path }
         @context.drag_context = drag_begin(@context.source_targets,
                                            @context.source_actions,
                                            @context.pressed_button,

data/lib/alexandria/ui/new_book_dialog.rb

@@ -20,13 +20,15 @@ module Alexandria
       include ImageFetcher
       include GetText
       extend GetText
+
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
       @@last_criterion_was_not_isbn = false
 
-      def initialize(parent, selected_library = nil, &block)
+      def initialize(parent_window, ui_manager, selected_library, &block)
         super("new_book_dialog__builder.glade", widget_names)
         log.info { "New Book Dialog" }
-        @new_book_dialog.transient_for = @parent = parent
+        @new_book_dialog.transient_for = @parent = parent_window
+        @ui_manager = ui_manager
         @block = block
         @destroyed = false
         @selected_library = selected_library
@@ -317,7 +319,7 @@ module Alexandria
         return unless entry.text =~ /^\..*?\..*?\.(.*?)\.$/
 
         tmp = Regexp.last_match[1].tr("a-zA-Z0-9+-", " -_")
-        tmp = ((32 + tmp.length * 3 / 4).to_i.chr << tmp).unpack1("u")
+        tmp = ((tmp.length * 3 / 4 + 32).to_i.chr << tmp).unpack1("u")
         tmp.chomp!("\000")
         entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
         entry.text = "Bad scan result" if entry.text.count("^ -~") > 0
@@ -426,7 +428,7 @@ module Alexandria
             @treeview_results.model.clear
             @entry_search.grab_focus
           else
-            @button_add.sensitive = true #
+            @button_add.sensitive = true
             @entry_isbn.text = "" # blank ISBN field
             @entry_isbn.grab_focus
           end
@@ -473,24 +475,11 @@ module Alexandria
       end
 
       def notify_start_add_by_isbn
-        main_progress_bar = MainApp.instance.appbar.children.first
-        main_progress_bar.visible = true
-        @progress_pulsing = GLib::Timeout.add(100) do
-          if @destroyed
-            false
-          else
-            main_progress_bar.pulse
-            true
-          end
-        end
+        ui_manager.start_progress_bar_pulsing(self)
       end
 
       def notify_end_add_by_isbn
-        MainApp.instance.appbar.children.first.visible = false
-        return unless @progress_pulsing
-
-        GLib::Source.remove(@progress_pulsing)
-        @progress_pulsing = nil
+        ui_manager.stop_progress_bar_pulsing
       end
 
       def update(status, provider)
@@ -502,7 +491,7 @@ module Alexandria
         }
         message = messages[status] % provider
         log.debug { "update message : #{message}" }
-        MainApp.instance.ui_manager.set_status_label(message)
+        ui_manager.set_status_label(message)
       end
 
       def on_focus
@@ -556,6 +545,12 @@ module Alexandria
         Alexandria::UI.display_help(@preferences_dialog, "add-book-by-isbn")
       end
 
+      def destroyed?
+        @new_book_dialog.destroyed?
+      end
+
+      attr_reader :ui_manager
+
       private
 
       def assert_not_exist(library, isbn)