alexandria-book-collection-manager 0.7.5 → 0.7.6

data/lib/alexandria/ui/listview.rb

@@ -83,9 +83,8 @@ module Alexandria
       end
 
       def setup_tags_column
-        # adding tags column...
         title = _("Tags")
-        log.debug { "Create listview column for tags..." }
+        log.debug { "Create listview column for tags" }
         renderer = Gtk::CellRendererText.new
         renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
@@ -105,7 +104,7 @@ module Alexandria
 
       def setup_rating_column
         title = _("Rating")
-        log.debug { format("Create listview column for %s...", title) }
+        log.debug { format("Create listview column for %s", title) }
         column = Gtk::TreeViewColumn.new(title)
         column.sizing = :fixed
         width = (Icons::STAR_SET.width + 1) * Book::MAX_RATING_STARS
@@ -164,7 +163,7 @@ module Alexandria
         column = Gtk::TreeViewColumn.new(title, renderer, text: iterid)
         column.sort_column_id = iterid
         column.resizable = true
-        log.debug { format("Create listview column for %s...", title) }
+        log.debug { format("Create listview column for %s", title) }
 
         column.add_attribute(renderer, "active", iterid)
         if iterid == Columns::WANT
@@ -176,7 +175,7 @@ module Alexandria
       end
 
       def setup_text_column(title, iterid)
-        log.debug { format("Create listview column for %s...", title) }
+        log.debug { format("Create listview column for %s", title) }
         renderer = Gtk::CellRendererText.new
         renderer.ellipsize = :end
         column = Gtk::TreeViewColumn.new(title, renderer,
@@ -204,7 +203,7 @@ module Alexandria
         ]
         cols = @listview.columns[1..-1] # skip "Title"
         cols.each_index do |i|
-          cols[i].visible = !!cols_visibility[i]
+          cols[i].visible = cols_visibility[i]
         end
         log.debug do
           "Columns visibility: " +

data/lib/alexandria/ui/main_app.rb

@@ -50,8 +50,8 @@ module Alexandria
       include Logging
       include GetText
       include Singleton
-      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs
-      attr_accessor :ui_manager
+      attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs, :ui_manager
+
       def initialize
         log.info { "Starting MainApp" }
         @ui_manager = UIManager.new self

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -6,16 +6,14 @@
 
 module Alexandria
   module EventOverrides
-    def ==(obj)
-      obj.is_a?(self.class) &&
-        (time == obj.time) && (x == obj.x) && (y == obj.y) &&
-        (button == obj.button)
+    def ==(other)
+      other.is_a?(self.class) &&
+        (time == other.time) && (x == other.x) && (y == other.y) &&
+        (button == other.button)
     end
   end
 
   module TreeViewOverrides
-    # include Alexandria::Logging
-
     Context = Struct.new(:pressed_button,
                          :x,
                          :y,

data/lib/alexandria/ui/new_book_dialog.rb

@@ -32,6 +32,10 @@ module Alexandria
         @progressbar.hide
       end
 
+      def show
+        @new_book_dialog.show
+      end
+
       def widget_names
         [:new_book_dialog, :button_add, :button_cancel, :button_find,
          :button_help, :combo_libraries, :combo_search, :entry_isbn,
@@ -139,7 +143,7 @@ module Alexandria
 
       def on_changed(entry)
         ok = !entry.text.strip.empty?
-        decode_cuecat?(@entry_isbn) if entry == @entry_isbn
+        decode_cuecat(@entry_isbn) if entry == @entry_isbn
         (entry == @entry_isbn ? @button_add : @button_find).sensitive = ok
       end
 
@@ -186,7 +190,7 @@ module Alexandria
               if pixbuf.width > 1
                 iter = @treeview_results.model.get_iter(key.to_s)
                 unless @treeview_results.model.iter_is_valid?(iter)
-                  raise format("Iter is invalid! %s", iter)
+                  raise format(_("Iter is invalid! %s"), iter)
                 end
 
                 iter[2] = pixbuf # I bet you this is it!
@@ -284,15 +288,10 @@ module Alexandria
           # continue == false if @find_error OR if results are returned
           # timeout ends if continue is false!
 
-          unless continue
-            unless @find_thread.alive? # This happens after find_thread is done
-              unless @destroyed
-                # GLib::Source.remove(progress_pulsing)
-                # @progressbar.hide
-                notify_end_add_by_isbn
-                @button_add.sensitive = false
-              end
-            end
+          # @find_thread.alive? happens after find_thread is done
+          unless continue || @find_thread.alive? || @destroyed
+            notify_end_add_by_isbn
+            @button_add.sensitive = false
           end
 
           continue # timeout loop condition
@@ -307,7 +306,7 @@ module Alexandria
               (book.authors == book2.authors)
           end
           s += " (#{book.edition}, #{book.publisher})" if similar_books.length > 1
-          log.info { format("Copying %s into tree view.", book.title) }
+          log.info { format(_("Copying %s into tree view."), book.title) }
           iter = model.append
           iter[0] = s
           iter[1] = book.ident
@@ -315,14 +314,14 @@ module Alexandria
         end
       end
 
-      def decode_cuecat?(entry) # srsly?
-        if 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.chomp!("\000")
-          entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
-          entry.text = "Bad scan result" if entry.text.count("^ -~") > 0
-        end
+      def decode_cuecat(entry)
+        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.chomp!("\000")
+        entry.text = tmp.gsub!(/./) { |c| (c[0] ^ 67).chr }
+        entry.text = "Bad scan result" if entry.text.count("^ -~") > 0
       end
 
       def on_results_button_press_event(_widget, event)
@@ -353,8 +352,7 @@ module Alexandria
               notify_end_add_by_isbn
 
               if book
-
-                puts "adding book #{book} to library"
+                log.debug { "adding book #{book} to library" }
                 add_book_to_library(library, book, cover_url)
                 @entry_isbn.text = ""
 
@@ -384,7 +382,7 @@ module Alexandria
 
             isbn = book.isbn
             if isbn.nil? || isbn.empty?
-              puts "noisbn"
+              log.debug { "noisbn" }
               book.isbn = book.saved_ident = nil
               books_to_add << [book, cover]
               next
@@ -392,7 +390,7 @@ module Alexandria
 
             isbn = Library.canonicalise_ean(isbn)
             unless isbn
-              puts "invalidisbn #{book.isbn}"
+              log.debug { "invalidisbn #{book.isbn}" }
               next unless KeepBadISBNDialog.new(@new_book_dialog, book).keep?
 
               book.isbn = book.saved_ident = nil
@@ -416,7 +414,7 @@ module Alexandria
       end
 
       def post_addition(books, library, is_new_library)
-        puts "post_addition #{books.size}"
+        log.debug { "post_addition #{books.size}" }
         return if books.empty?
 
         # books, a 1d array of Alexandria::Book
@@ -491,10 +489,10 @@ module Alexandria
 
       def notify_end_add_by_isbn
         MainApp.instance.appbar.children.first.visible = false
-        if @progress_pulsing
-          GLib::Source.remove(@progress_pulsing)
-          @progress_pulsing = nil
-        end
+        return unless @progress_pulsing
+
+        GLib::Source.remove(@progress_pulsing)
+        @progress_pulsing = nil
       end
 
       def update(status, provider)
@@ -510,25 +508,26 @@ module Alexandria
       end
 
       def on_focus
-        if @isbn_radiobutton.active? && @entry_isbn.text.strip.empty?
-          clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
-          if (text = clipboard.wait_for_text)
-            if Library.valid_isbn?(text) || Library.valid_ean?(text) ||
-                Library.valid_upc?(text)
-              GLib::Idle.add do
-                @entry_isbn.text = text
-                @entry_isbn.grab_focus
-                @entry_isbn.select_region(0, -1) # select all...
-                # @button_add.grab_focus
-                false
-              end
-              log.debug { "Setting ISBN field to #{text}" }
-              puts text # required, strangely, to prevent GUI strangeness
-              # above last checked with ruby-gnome2 0.17.1 2009-12-09
-              # if this puts is commented out, the cursor disappears
-              # from the @entry_isbn box... weird, ne? - CathalMagus
-            end
+        return unless @isbn_radiobutton.active? && @entry_isbn.text.strip.empty?
+
+        clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
+        text = clipboard.wait_for_text or return
+
+        if Library.valid_isbn?(text) || Library.valid_ean?(text) ||
+            Library.valid_upc?(text)
+          GLib::Idle.add do
+            @entry_isbn.text = text
+            @entry_isbn.grab_focus
+            @entry_isbn.select_region(0, -1) # select all...
+            # @button_add.grab_focus
+            false
           end
+          log.debug { "Setting ISBN field to #{text}" }
+          # FIXME: Get rid of this puts!
+          puts text # required, strangely, to prevent GUI strangeness
+          # above last checked with ruby-gnome2 0.17.1 2009-12-09
+          # if this puts is commented out, the cursor disappears
+          # from the @entry_isbn box... weird, ne? - CathalMagus
         end
       end
 
@@ -566,11 +565,12 @@ module Alexandria
         isbn13 = Library.canonicalise_ean(isbn)
         return unless isbn13
 
-        if (book = library.find { |bk| bk.isbn == isbn13 })
-          raise DuplicateBookException,
-                format(_("'%s' already exists in '%s' (titled '%s')."),
-                       isbn, library.name, book.title.sub("&", "&amp;"))
-        end
+        book = library.find { |bk| bk.isbn == isbn13 }
+        return unless book
+
+        raise DuplicateBookException,
+              format(_("'%s' already exists in '%s' (titled '%s')."),
+                     isbn, library.name, book.title.sub("&", "&amp;"))
       end
     end
   end

data/lib/alexandria/ui/new_provider_dialog.rb

@@ -17,14 +17,14 @@ module Alexandria
               parent: parent,
               flags: :modal,
               buttons: [[Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL]])
-        @add_button = add_button(Gtk::Stock::ADD,
-                                 Gtk::ResponseType::ACCEPT)
+        @add_button = dialog.add_button(Gtk::Stock::ADD,
+                                        Gtk::ResponseType::ACCEPT)
 
         instances = BookProviders.abstract_classes.map(&:new)
         @selected_instance = nil
 
         @table = Gtk::Table.new(2, 2)
-        child.pack_start(@table)
+        dialog.child.pack_start(@table)
 
         # Name.
 
@@ -33,10 +33,10 @@ module Alexandria
         label_name.xalign = 0
         @table.attach_defaults(label_name, 0, 1, 0, 1)
 
-        entry_name = Gtk::Entry.new
-        entry_name.mandatory = true
-        label_name.mnemonic_widget = entry_name
-        @table.attach_defaults(entry_name, 1, 2, 0, 1)
+        @entry_name = Gtk::Entry.new
+        @entry_name.mandatory = true
+        label_name.mnemonic_widget = @entry_name
+        @table.attach_defaults(@entry_name, 1, 2, 0, 1)
 
         # Type.
 
@@ -62,14 +62,15 @@ module Alexandria
       end
 
       def acquire
-        show_all
-        if run == Gtk::ResponseType::ACCEPT
-          @selected_instance.reinitialize(entry_name.text)
+        dialog.show_all
+        if dialog.run == Gtk::ResponseType::ACCEPT
+          @selected_instance.reinitialize(@entry_name.text)
           sync_variables
         else
           @selected_instance = nil
         end
-        destroy
+        dialog.destroy
+        instance
       end
 
       def instance

data/lib/alexandria/ui/new_smart_library_dialog.rb

@@ -13,49 +13,61 @@ module Alexandria
       def initialize(parent)
         super(parent)
 
-        add_buttons([Gtk::Stock::CANCEL, :cancel],
-                    [Gtk::Stock::NEW, :ok])
+        dialog.add_buttons([Gtk::Stock::CANCEL, :cancel],
+                           [Gtk::Stock::NEW, :ok])
 
-        self.title = _("New Smart Library")
+        dialog.title = _("New Smart Library")
         # FIXME: Should accept just :cancel
-        self.default_response = Gtk::ResponseType::CANCEL
+        dialog.default_response = Gtk::ResponseType::CANCEL
+        insert_new_rule
       end
 
       def acquire
-        show_all
-        insert_new_rule
+        dialog.show_all
 
-        while ((response = run) != Gtk::ResponseType::CANCEL) &&
+        result = nil
+        while ((response = dialog.run) != Gtk::ResponseType::CANCEL) &&
             (response != Gtk::ResponseType::DELETE_EVENT)
 
-          if response == Gtk::ResponseType::HELP
-            Alexandria::UI.display_help(self, "new-smart-library")
-          elsif response == Gtk::ResponseType::OK
-            if user_confirms_possible_weirdnesses_before_saving?
-              rules = smart_library_rules
-              basename = smart_library_base_name(rules) || _("Smart Library")
-              name = Library.generate_new_name(
-                LibraryCollection.instance.all_libraries,
-                basename)
-              library = SmartLibrary.new(name,
-                                         rules,
-                                         predicate_operator_rule)
-              yield(library)
-              break
-            end
+          case response
+          when Gtk::ResponseType::HELP
+            handle_help_response
+          when Gtk::ResponseType::OK
+            result = handle_ok_response
+            break if result
           end
         end
 
-        destroy
+        dialog.destroy
+        result
       end
 
       private
 
+      def handle_help_response
+        Alexandria::UI.display_help(self, "new-smart-library")
+      end
+
+      def handle_ok_response
+        user_confirms_possible_weirdnesses_before_saving? or return
+
+        rules = smart_library_rules
+        basename = smart_library_base_name(rules) || _("Smart Library")
+        name = Library.generate_new_name(
+          LibraryCollection.instance.all_libraries,
+          basename)
+        library_store = LibraryCollection.instance.library_store
+        SmartLibrary.new(name,
+                         rules,
+                         predicate_operator_rule,
+                         library_store)
+      end
+
       def smart_library_base_name(rules)
-        if rules.length == 1
-          value = rules.first.value
-          return value if value.is_a?(String) && !value.strip.empty?
-        end
+        return unless rules.length == 1
+
+        value = rules.first.value
+        value if value.is_a?(String) && !value.strip.empty?
       end
     end
   end

data/lib/alexandria/ui/preferences_dialog.rb

@@ -13,7 +13,7 @@ require "alexandria/ui/new_provider_dialog"
 module Alexandria
   module UI
     class PreferencesDialog < BuilderBase
-      include Alexandria::Logging
+      include Logging
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
@@ -37,7 +37,7 @@ module Alexandria
         }
         @cols.each_pair do |checkbutton, pref_name|
           if checkbutton
-            checkbutton.active = Preferences.instance.send(pref_name)
+            checkbutton.active = Preferences.instance.get_variable(pref_name)
           else
             log.warn do
               "no CheckButton for property #{pref_name} " \
@@ -76,21 +76,17 @@ module Alexandria
         renderer = Gtk::CellRendererText.new
         column = Gtk::TreeViewColumn.new("Providers",
                                          renderer)
-        # :text => 0)
         column.set_cell_data_func(renderer) do |_col, rndr, _mod, iter|
           rndr.markup = iter[0]
-          # enabled = iter[2]
-          # unless enabled
-          #  rndr.foreground = "gray"
-          # end
-          # rndr.active = value
         end
         @treeview_providers.append_column(column)
-        @treeview_providers.selection.signal_connect("changed") \
-        { sensitize_providers }
+        @treeview_providers.selection
+          .signal_connect("changed") { sensitize_providers }
 
         @button_prov_setup.sensitive = false
-        @button_prov_up.sensitive = @button_prov_down.sensitive = BookProviders.length > 1
+
+        @button_prov_up.sensitive =
+          @button_prov_down.sensitive = BookProviders.list.length > 1
 
         @buttonbox_prov.set_child_secondary(@button_prov_add, true)
         @buttonbox_prov.set_child_secondary(@button_prov_remove, true)
@@ -102,11 +98,14 @@ module Alexandria
           @checkbutton_prov_advanced.active = true if view_advanced
         end
 
-        setup_enable_disable_popup
         sensitize_providers
         setup_barcode_scanner_tab
       end
 
+      def show
+        @preferences_dialog.show
+      end
+
       def widget_names
         [:button_prov_add, :button_prov_down, :button_prov_remove,
          :button_prov_setup, :button_prov_up, :buttonbox_prov,
@@ -141,63 +140,6 @@ module Alexandria
         @use_scan_sound.active = Preferences.instance.play_scan_sound
       end
 
-      def setup_enable_disable_popup
-        # New Enable/Disable pop-up menu...
-        @enable_disable_providers_menu = Gtk::Menu.new
-        @enable_item = Gtk::MenuItem.new(label: _("Disable Provider"))
-        @enable_item.signal_connect("activate") do
-          prov = selected_provider
-          prov.toggle_enabled
-          adjust_selected_provider(prov)
-        end
-        @enable_disable_providers_menu.append(@enable_item)
-        @enable_disable_providers_menu.show_all
-
-        @treeview_providers.signal_connect("button_press_event") do |widget, event|
-          if event_is_right_click(event)
-            if (path = widget.get_path_at_pos(event.x, event.y))
-              widget.grab_focus
-              obj = widget.selection
-              path = path.first
-              unless obj.path_is_selected?(path)
-                widget.unselect_all
-                obj.select_path(path)
-              end
-              sel = widget.selection.selected
-              if sel
-                already_enabled = sel[2]
-                message = already_enabled ? _("Disable Provider") : _("Enable Provider")
-                @enable_item.label = message
-                GLib::Idle.add do
-                  @enable_disable_providers_menu.popup(nil, nil, event.button, event.time)
-                  false
-                end
-              end
-            else
-              puts "not on a path"
-            end
-          end
-        end
-
-        # Popup the menu on Shift-F10
-        @treeview_providers.signal_connect("popup_menu") do
-          selected_prov = @treeview_providers.selection.selected
-          puts selected_prov.inspect
-          if selected_prov
-            GLib::Idle.add do
-              already_enabled = selected_prov[2]
-              message = already_enabled ? _("Disable Provider") : _("Enable Provider")
-              @enable_item.label = message
-
-              @enable_disable_providers_menu.popup(nil, nil, 0, :current_time)
-              false
-            end
-          else
-            puts "no action"
-          end
-        end
-      end
-
       def event_is_right_click(event)
         (event.event_type == :button_press) && (event.button == 3)
       end
@@ -239,11 +181,11 @@ module Alexandria
       end
 
       def on_provider_add
-        dialog = NewProviderDialog.new(@preferences_dialog).acquire
-        if dialog.instance
-          BookProviders.update_priority
-          reload_providers
-        end
+        provider = NewProviderDialog.new(@preferences_dialog).acquire
+        return unless provider
+
+        BookProviders.instance.update_priority
+        reload_providers
       end
 
       def on_scanner_device_type(_combo)
@@ -277,7 +219,7 @@ module Alexandria
         dialog.show_all
         if dialog.run == Gtk::ResponseType::OK
           provider.remove
-          BookProviders.update_priority
+          BookProviders.instance.update_priority
           reload_providers
         end
         dialog.destroy
@@ -286,8 +228,7 @@ module Alexandria
       def on_column_toggled(checkbutton)
         raise if @cols[checkbutton].nil?
 
-        Preferences.instance.send("#{@cols[checkbutton]}=",
-                                  checkbutton.active?)
+        Preferences.instance.set_variable(@cols[checkbutton], checkbutton.active?)
 
         @changed_block.call
       end
@@ -312,7 +253,7 @@ module Alexandria
       def reload_providers
         model = @treeview_providers.model
         model.clear
-        BookProviders.each_with_index do |x, index|
+        BookProviders.list.each_with_index do |x, index|
           iter = model.append
           iter[0] = if x.enabled
                       x.fullname
@@ -327,7 +268,7 @@ module Alexandria
 
       def selected_provider
         iter = @treeview_providers.selection.selected
-        BookProviders.find { |x| x.name == iter[1] } unless iter.nil?
+        BookProviders.list.find { |x| x.name == iter[1] } unless iter.nil?
       end
 
       def adjust_selected_provider(prov)
@@ -350,10 +291,10 @@ module Alexandria
           @button_prov_setup.sensitive = false
           @button_prov_remove.sensitive = false
         else
-          last_iter = model.get_iter((BookProviders.length - 1).to_s)
+          last_iter = model.get_iter((BookProviders.list.length - 1).to_s)
           @button_prov_up.sensitive = sel_iter != model.iter_first
           @button_prov_down.sensitive = sel_iter != last_iter
-          provider = BookProviders.find { |x| x.name == sel_iter[1] }
+          provider = BookProviders.list.find { |x| x.name == sel_iter[1] }
           @button_prov_setup.sensitive = !prefs_empty(provider.prefs)
           @button_prov_remove.sensitive = provider.abstract?
         end
@@ -365,7 +306,7 @@ module Alexandria
           priority << iter[1]
         end
         Preferences.instance.providers_priority = priority
-        BookProviders.update_priority
+        BookProviders.instance.update_priority
       end
     end
   end