alexandria-book-collection-manager 0.7.5 → 0.7.9

data/lib/alexandria/ui/smart_library_rule_box.rb

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+module Alexandria
+  module UI
+    class SmartLibraryRuleBox
+      attr_accessor :rule_box,
+                    :left_operand_combo, :operator_combo,
+                    :value_entry, :date_entry, :entry_label,
+                    :add_button, :remove_button
+
+      def initialize(parent)
+        @parent = parent
+
+        self.rule_box = Gtk::Box.new :horizontal
+        rule_box.spacing = 8
+
+        self.left_operand_combo = Gtk::ComboBoxText.new
+        self.operator_combo = Gtk::ComboBoxText.new
+
+        self.value_entry = Gtk::Entry.new
+
+        self.date_entry = Gtk::Entry.new.tap do |entry|
+          entry.primary_icon_name = Gtk::Stock::EDIT
+
+          entry.primary_icon_activatable = true
+          entry.signal_connect("icon-press") do |widget, primary, icon|
+            @parent.handle_date_icon_press(widget, primary, icon)
+          end
+        end
+
+        self.entry_label = Gtk::Label.new("")
+
+        self.add_button = Gtk::Button.new(label: "").tap do |widget|
+          widget.remove(widget.children.first)
+          widget << Gtk::Image.new(stock: Gtk::Stock::ADD,
+                                   size: Gtk::IconSize::BUTTON)
+
+          widget.signal_connect("clicked") { @parent.handle_add_rule_clicked }
+        end
+
+        self.remove_button = Gtk::Button.new(label: "")
+        remove_button.remove(remove_button.children.first)
+        remove_button << Gtk::Image.new(stock: Gtk::Stock::REMOVE,
+                                        size: Gtk::IconSize::BUTTON)
+
+        remove_button.signal_connect("clicked") do |_button|
+          @parent.handle_remove_rule_clicked(self)
+        end
+
+        operands.each do |operand|
+          left_operand_combo.append_text(operand.name)
+        end
+
+        operator_combo.signal_connect("changed") do
+          handle_operator_changed
+        end
+
+        left_operand_combo.signal_connect("changed") do
+          handle_left_operand_changed
+        end
+
+        rule_box.pack_start(left_operand_combo, expand: false, fill: false)
+        rule_box.pack_start(operator_combo, expand: false, fill: false)
+        rule_box.pack_start(value_entry)
+        rule_box.pack_start(date_entry)
+        rule_box.pack_start(entry_label, expand: false, fill: false)
+        rule_box.pack_end(remove_button, expand: false, fill: false)
+        rule_box.pack_end(add_button, expand: false, fill: false)
+
+        value_entry.visible = date_entry.visible = entry_label.visible = false
+      end
+
+      def operands
+        SmartLibrary::Rule::Operands::LEFT
+      end
+
+      def handle_operator_changed
+        operand = operands[left_operand_combo.active]
+        operations = SmartLibrary::Rule.operations_for_operand(operand)
+        operation = operations[operator_combo.active]
+
+        value_entry.visible = date_entry.visible = entry_label.visible = false
+        right_operand = operation.last
+        unless right_operand.nil?
+          entry = case right_operand.klass.name
+                  when "Time"
+                    date_entry
+                  else
+                    value_entry
+                  end
+          entry.visible = true
+          unless right_operand.name.nil?
+            entry_label.text = right_operand.name
+            entry_label.visible = true
+          end
+        end
+
+        @parent.apply_smart_rule_for_rule_box(rule_box, operand, operation)
+      end
+
+      def handle_left_operand_changed
+        operand = operands[left_operand_combo.active]
+        operator_combo.freeze_notify do
+          operator_combo.remove_all
+          operations = SmartLibrary::Rule.operations_for_operand(operand)
+          operations.each do |operation|
+            operator = operation.first
+            operator_combo.append_text(operator.name)
+          end
+          operator_combo.active = 0
+        end
+      end
+    end
+  end
+end

data/lib/alexandria/ui/sound.rb

@@ -39,9 +39,9 @@ module Alexandria
       def play(effect)
         file = File.join(@sounds_dir, "#{effect}.ogg")
         if @playing
-          puts "Already playing #{effect}." if $DEBUG
+          log.debug { "Already playing #{effect}." }
         else
-          puts "Not playing. Starting #{effect}." if $DEBUG
+          log.debug { "Not playing. Starting #{effect}." }
           @filesrc.location = file
           start_playback
         end
@@ -76,10 +76,8 @@ module Alexandria
           when Gst::MessageType::EOS
             stop_playback
           when Gst::MessageType::ERROR
-            if $DEBUG
-              puts "ERROR loop.quit"
-              p message.parse
-            end
+            log.debug { "ERROR loop.quit" }
+            log.debug { message.parse.inspect }
             stop_playback
           end
           true

data/lib/alexandria/ui/ui_manager.rb

@@ -15,6 +15,7 @@ module Alexandria
       attr_accessor :main_app, :actiongroup, :appbar, :prefs, :listview, :iconview,
                     :listview_model, :iconview_model, :filtered_model
       attr_reader :model
+
       include Logging
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -74,7 +75,7 @@ module Alexandria
         @iconview_model = Gtk::TreeModelSort.new(@filtered_model)
         @listview_manager = ListViewManager.new @listview, self
         @iconview_manager = IconViewManager.new @iconview, self
-        @sidepane_manager = SidePaneManager.new @library_listview, self
+        @sidepane_manager = SidepaneManager.new @library_listview, self
         @library_listview = @sidepane_manager.library_listview
         @listview_manager.setup_listview_columns_visibility
         @listview_manager.setup_listview_columns_width
@@ -122,7 +123,9 @@ module Alexandria
 
       def setup_toolbar_filter_entry
         @filter_entry = Gtk::Entry.new
-        @filter_entry.signal_connect("changed", &method(:on_toolbar_filter_entry_changed))
+        @filter_entry.signal_connect("changed") do |entry|
+          on_toolbar_filter_entry_changed(entry)
+        end
         @toolitem = Gtk::ToolItem.new
         @toolitem.expand = true
         @toolitem.border_width = 5
@@ -148,7 +151,7 @@ module Alexandria
           cb.append_text(item)
         end
         cb.active = 0
-        cb.signal_connect("changed", &method(:on_criterion_combobox_changed))
+        cb.signal_connect("changed") { |combo| on_criterion_combobox_changed(combo) }
 
         # Put the combo box in a event box because it is not currently
         # possible assign a tooltip to a combo box.
@@ -166,8 +169,9 @@ module Alexandria
         @toolbar_view_as.append_text(_("View as Icons"))
         @toolbar_view_as.append_text(_("View as List"))
         @toolbar_view_as.active = 0
-        @toolbar_view_as_signal_hid = \
-          @toolbar_view_as.signal_connect("changed", &method(:on_toolbar_view_as_changed))
+        @toolbar_view_as_signal_hid = @toolbar_view_as.signal_connect("changed") do |combo|
+          on_toolbar_view_as_changed(combo)
+        end
 
         # Put the combo box in a event box because it is not currently
         # possible assign a tooltip to a combo box.
@@ -183,15 +187,16 @@ module Alexandria
       def setup_book_providers
         log.debug { "setup_book_providers" }
         mid = @uimanager.new_merge_id
-        BookProviders.each do |provider|
+        ui_paths = ["ui/MainMenubar/ViewMenu/OnlineInformation/",
+                    "ui/BookPopup/OnlineInformation/",
+                    "ui/NoBookPopup/OnlineInformation/"]
+        BookProviders.list.each do |provider|
           name = provider.action_name
-          ["ui/MainMenubar/ViewMenu/OnlineInformation/",
-           "ui/BookPopup/OnlineInformation/",
-           "ui/NoBookPopup/OnlineInformation/"].each do |path|
-             log.debug { "Adding #{name} to #{path}" }
-             @uimanager.add_ui(mid, path, name, name,
-                               :menuitem, false)
-           end
+          ui_paths.each do |path|
+            log.debug { "Adding #{name} to #{path}" }
+            @uimanager.add_ui(mid, path, name, name,
+                              :menuitem, false)
+          end
         end
       end
 
@@ -224,8 +229,12 @@ module Alexandria
 
       def setup_window_events
         log.debug { "setup_window_events" }
-        @main_app.signal_connect("window-state-event", &method(:on_window_state_event))
-        @main_app.signal_connect("destroy", &method(:on_window_destroy))
+        @main_app.signal_connect("window-state-event") do |window, event|
+          on_window_state_event(window, event)
+        end
+        @main_app.signal_connect("destroy") do |window|
+          on_window_destroy(window)
+        end
       end
 
       def setup_active_model
@@ -341,7 +350,7 @@ module Alexandria
           sensitize_library selected_library if library_already_selected
 
           GLib::Idle.add do
-            menu.popup(nil, nil, event.button, event.time)
+            menu.popup_at_pointer(event)
             false
           end
 
@@ -371,25 +380,25 @@ module Alexandria
 
       def on_books_button_press_event(widget, event)
         log.debug { "books_button_press_event" }
-        if event_is_right_click event
-          widget.grab_focus
+        event_is_right_click event or return
 
-          if (path = widget.get_path_at_pos(event.x.to_i, event.y.to_i))
-            obj, path =
-              widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+        widget.grab_focus
 
-            unless obj.path_is_selected?(path)
-              log.debug { "Select #{path}" }
-              widget.unselect_all
-              obj.select_path(path)
-            end
-          else
+        if (path = widget.get_path_at_pos(event.x.to_i, event.y.to_i))
+          obj, path =
+            widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+
+          unless obj.path_is_selected?(path)
+            log.debug { "Select #{path}" }
             widget.unselect_all
+            obj.select_path(path)
           end
-
-          menu = selected_books.empty? ? @nobook_popup : @book_popup
-          menu.popup(nil, nil, event.button, event.time)
+        else
+          widget.unselect_all
         end
+
+        menu = selected_books.empty? ? @nobook_popup : @book_popup
+        menu.popup_at_pointer(event)
       end
 
       def get_library_selection_text(library)
@@ -409,7 +418,7 @@ module Alexandria
                       library.length), library.name, library.length)
           else
             format(n_("Library '%s' selected, %d book, " \
-               "%d unrated",
+                      "%d unrated",
                       "Library '%s' selected, %d books, " \
                       "%d unrated",
                       library.length), library.name, library.length, n_unrated)
@@ -446,7 +455,7 @@ module Alexandria
           log.debug { "#{@library_listview} : #{@library_popup} : #{@listview}" }
           log.debug do
             "@library_listview: #{@library_listview.has_focus?} " \
-            "or @library_popup:#{@library_popup.has_focus?}"
+              "or @library_popup:#{@library_popup.has_focus?}"
           end
           log.debug { "@library_listview does *NOT* have focus" }
           log.debug { "Books are empty: #{books.empty?}" }
@@ -475,7 +484,7 @@ module Alexandria
             b = books.first
             # FIXME: Clean up endless negation in this logic
             no_urls = true
-            BookProviders.each do |provider|
+            BookProviders.list.each do |provider|
               has_no_url = true
               begin
                 has_no_url = (b.isbn.nil? || b.isbn.strip.empty? || provider.url(b).nil?)
@@ -523,42 +532,21 @@ module Alexandria
       end
 
       def select_a_book(book)
-        select_this_book = proc do |bk, view|
-          @filtered_model.refilter
-          iter = iter_from_book bk
-          next unless iter
-
-          path = iter.path
-          next unless view.model
-
-          path = view_path_to_model_path(view, path)
-          log.debug { "Path for #{bk.ident} is #{path}" }
-          selection = view.respond_to?(:selection) ? @listview.selection : @iconview
-          selection.unselect_all
-          selection.select_path(path)
-        end
-        begin
-          log.debug { "select_a_book: listview" }
-          select_this_book.call(book, @listview)
-          log.debug { "select_a_book: listview" }
-          select_this_book.call(book, @iconview)
-        rescue StandardError => ex
-          trace = ex.backtrace.join("\n> ")
-          log.warn { "Failed to automatically select book: #{ex.message} #{trace}" }
-        end
-        # TODO: Figure out why this frequently selects the wrong book!
+        select_book_in_view(book, @listview)
+        select_book_in_view(book, @iconview)
       end
 
       def update(*ary)
         log.debug { "on_update #{ary}" }
         caller = ary.first
-        if caller.is_a?(UndoManager)
+        case caller
+        when UndoManager
           @actiongroup["Undo"].sensitive = caller.can_undo?
           @actiongroup["Redo"].sensitive = caller.can_redo?
-        elsif caller.is_a?(Library)
+        when Library
           handle_update_caller_library ary unless caller.updating?
         else
-          raise "unrecognized update event"
+          raise _("unrecognized update event")
         end
       end
 
@@ -584,8 +572,6 @@ module Alexandria
         end
       end
 
-      # private
-
       def open_web_browser(url)
         if url.nil?
           log.warn("Attempt to open browser with nil url")
@@ -605,7 +591,7 @@ module Alexandria
       end
 
       def load_libraries
-        log.info { "Loading libraries..." }
+        log.info { _("Loading libraries...") }
         @completion_models = CompletionModels.instance
         if @libraries
           detach_old_libraries
@@ -669,7 +655,7 @@ module Alexandria
 
                   log.debug do
                     "Trying to add #{book.title}, #{cover_uri}" \
-                    " in library ''#{library.name}'"
+                      " in library ''#{library.name}'"
                   end
                   library.save_cover(book, cover_uri) unless cover_uri.nil?
                   library << book
@@ -750,7 +736,7 @@ module Alexandria
           new_height = [ICON_HEIGHT, icon.height].min
           icon = cache_scaled_icon(icon, new_width, new_height)
         end
-        icon = icon.tag(Icons::FAVORITE_TAG) if rating == Book::MAX_RATING_STARS
+        icon = Icons.tag_icon(icon, Icons::FAVORITE_TAG) if rating == Book::MAX_RATING_STARS
         iter[Columns::COVER_ICON] = icon
         log.debug { "Full iter: " + (0..15).map { |num| iter[num].inspect }.join(", ") }
       end
@@ -889,9 +875,8 @@ module Alexandria
       end
 
       def iter_from_ident(ident)
-        log.debug { ident.to_s }
         iter = @model.iter_first
-        ok = true
+        ok = true if iter
         while ok
           return iter if iter[Columns::IDENT] == ident
 
@@ -901,7 +886,6 @@ module Alexandria
       end
 
       def iter_from_book(book)
-        log.debug { book.to_s }
         iter_from_ident(book.ident)
       end
 
@@ -971,7 +955,7 @@ module Alexandria
       end
 
       def restore_preferences
-        log.debug { "Restoring preferences..." }
+        log.debug { "Restoring preferences" }
         if @prefs.maximized
           @main_app.maximize
         else
@@ -1045,7 +1029,7 @@ module Alexandria
 
       def setup_move_actions
         @actiongroup.actions.each do |action|
-          next unless /^MoveIn/.match?(action.name)
+          next unless action.name.start_with?("MoveIn")
 
           @actiongroup.remove_action(action)
         end
@@ -1060,10 +1044,11 @@ module Alexandria
         @actiongroup.add_actions(actions)
         @uimanager.remove_ui(@move_mid) if @move_mid
         @move_mid = @uimanager.new_merge_id
+        ui_paths = ["ui/MainMenubar/EditMenu/Move/",
+                    "ui/BookPopup/Move/"]
         @libraries.all_regular_libraries.each do |library|
           name = library.action_name
-          ["ui/MainMenubar/EditMenu/Move/",
-           "ui/BookPopup/Move/"].each do |path|
+          ui_paths.each do |path|
             @uimanager.add_ui(@move_mid, path, name, name,
                               :menuitem, false)
           end
@@ -1084,7 +1069,7 @@ module Alexandria
         # added by Cathal Mc Ginley, 23 Oct 2007
         log.debug do
           "library_sort_order #{@notebook.page}: " \
-          "#{@iconview.model.inspect} #{@listview.model.inspect}"
+            "#{@iconview.model.inspect} #{@listview.model.inspect}"
         end
         result, sort_column, sort_order = current_view.model.sort_column_id
         if result
@@ -1110,10 +1095,10 @@ module Alexandria
       def get_previous_selected_library(library)
         log.debug { "get_previous_selected_library: #{library}" }
         @previous_selected_library = selected_library
-        if @previous_selected_library != library
-          select_library(library)
-        else
+        if @previous_selected_library == library
           @previous_selected_library = nil
+        else
+          select_library(library)
         end
       end
 
@@ -1147,10 +1132,10 @@ module Alexandria
       end
 
       def remove_library_separator
-        if !@library_separator_iter.nil? && @libraries.all_smart_libraries.empty?
-          @library_listview.model.remove(@library_separator_iter)
-          @library_separator_iter = nil
-        end
+        return if @library_separator_iter.nil? || @libraries.all_smart_libraries.any?
+
+        @library_listview.model.remove(@library_separator_iter)
+        @library_separator_iter = nil
       end
 
       def undoable_undelete(library, books = nil)
@@ -1190,9 +1175,21 @@ module Alexandria
 
       private
 
-      def view_path_to_model_path(view, path)
-        path = view.model.convert_path_to_child_path(path)
-        @filtered_model.convert_path_to_child_path(path) if path
+      def select_book_in_view(book, view)
+        return unless view.model
+
+        @filtered_model.refilter
+        iter = iter_from_book(book) or return
+        path = iter.path
+        path = view_path_to_model_path(view, path)
+        selection = view.respond_to?(:selection) ? view.selection : view
+        selection.unselect_all
+        selection.select_path(path) if path
+      end
+
+      def view_path_to_model_path(view, view_path)
+        filter_path = view.model.convert_path_to_child_path(view_path)
+        @filtered_model.convert_path_to_child_path(filter_path) if filter_path
       end
     end
   end

data/lib/alexandria/ui.rb

@@ -31,21 +31,21 @@ module Alexandria
   module UI
     include Logging
     def self.init_icons
-      log.info { "Initializing Icons..." }
+      log.info { "Initializing Icons" }
       Icons.init
     end
 
     def self.start_main_app
-      puts "==========================" if $DEBUG
-      log.info { "Starting MainApp..." }
-      puts "==========================" if $DEBUG
+      log.debug { "==========================" }
+      log.info { "Starting MainApp" }
+      log.debug { "==========================" }
       MainApp.instance
     end
 
     def self.start_gtk
-      puts "====================================" if $DEBUG
-      log.info { "Starting Gtk..." }
-      puts "====================================" if $DEBUG
+      log.debug { "====================================" }
+      log.info { "Starting Gtk" }
+      log.debug { "====================================" }
       Gtk.main
     end
 

data/lib/alexandria/version.rb

@@ -5,7 +5,7 @@
 # See the file README.md for authorship and licensing information.
 
 module Alexandria
-  VERSION = "0.7.5"
+  VERSION = "0.7.9"
   DATA_VERSION = "0.6.3"
-  DISPLAY_VERSION = "0.7.5"
+  DISPLAY_VERSION = VERSION
 end

data/lib/alexandria/web_themes.rb

@@ -22,6 +22,17 @@ module Alexandria
   class WebTheme
     attr_reader :name, :css_file, :preview_file, :pixmaps_directory
 
+    def initialize(css_file, preview_file, pixmaps_directory)
+      @name = File.basename(css_file, ".css").capitalize
+      @css_file = css_file
+      @preview_file = preview_file
+      @pixmaps_directory = pixmaps_directory
+    end
+
+    def has_pixmaps?
+      File.exist?(@pixmaps_directory)
+    end
+
     def self.all
       themes_dir = [
         # System dir
@@ -33,18 +44,12 @@ module Alexandria
       themes_dir.map { |x| load(x) }.flatten
     end
 
-    def has_pixmaps?
-      File.exist?(@pixmaps_directory)
-    end
-
-    private
-
     def self.load(themes_dir)
       themes = []
       if File.exist?(themes_dir)
         Dir.entries(themes_dir).each do |file|
           # ignore hidden files
-          next if /^\./.match?(file)
+          next if file.start_with?(".")
 
           # ignore non-directories
           path = File.join(themes_dir, file)
@@ -55,7 +60,9 @@ module Alexandria
           css_file = File.join(path, file + ".css")
           preview_file = File.join(path, "preview.jpg")
           [css_file, preview_file].each do |helper_file|
-            raise "#{helper_file} not found" unless File.exist?(helper_file)
+            unless File.exist?(helper_file)
+              raise format(_("File %<file>s not found"), file: helper_file)
+            end
           end
           themes << WebTheme.new(css_file, preview_file,
                                  File.join(path, file, "pixmaps"))
@@ -65,12 +72,5 @@ module Alexandria
       end
       themes
     end
-
-    def initialize(css_file, preview_file, pixmaps_directory)
-      @name = File.basename(css_file, ".css").capitalize
-      @css_file = css_file
-      @preview_file = preview_file
-      @pixmaps_directory = pixmaps_directory
-    end
   end
 end

data/lib/alexandria.rb

@@ -28,8 +28,8 @@ module Alexandria
   end
 
   def self.set_log_level
-    Alexandria.log.level = Logger::DEBUG if $DEBUG
-    Alexandria.log.debug { "Initializing Alexandria..." }
+    log.level = Logger::DEBUG if $DEBUG
+    log.debug { "Initializing Alexandria" }
   end
 
   def self.main