alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/ui/completion_models.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2006 Laurent Sansonetti
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -16,69 +16,73 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-class Gtk::Entry
-  def complete_titles
-    complete(Alexandria::UI::CompletionModels::TITLE)
-  end
-
-  def complete_authors
-    complete(Alexandria::UI::CompletionModels::AUTHOR)
-  end
+module Alexandria
+  module EntryOverrides
+    def complete_titles
+      complete(Alexandria::UI::CompletionModels::TITLE)
+    end
 
-  def complete_publishers
-    complete(Alexandria::UI::CompletionModels::PUBLISHER)
-  end
+    def complete_authors
+      complete(Alexandria::UI::CompletionModels::AUTHOR)
+    end
 
-  def complete_editions
-    complete(Alexandria::UI::CompletionModels::EDITION)
-  end
+    def complete_publishers
+      complete(Alexandria::UI::CompletionModels::PUBLISHER)
+    end
 
-  def complete_borrowers
-    complete(Alexandria::UI::CompletionModels::BORROWER)
-  end
+    def complete_editions
+      complete(Alexandria::UI::CompletionModels::EDITION)
+    end
 
-  def complete_tags
-    complete(Alexandria::UI::CompletionModels::TAG)
-    # min = self.completion.minimum_key_length
-    min = 2
-    completion.signal_connect('match-selected') do |c, model, iter|
-      cur_text = c.entry.text
-      new_tag = model.get_value(iter, 0)
-      cur_text_split = cur_text.split(',')
-      cur_text_split.delete_at(-1)
-      cur_text_split << new_tag
-      c.entry.text = cur_text_split.join(',')
-      true
+    def complete_borrowers
+      complete(Alexandria::UI::CompletionModels::BORROWER)
     end
-    completion.set_match_func do |_comp, key, iter|
-      cur_tag = key.split(',').last.strip
-      if cur_tag.size >= min
-        begin
-          if iter[0] =~ /^#{cur_tag}/
-            true
-          else
+
+    def complete_tags
+      complete(Alexandria::UI::CompletionModels::TAG)
+      # min = self.completion.minimum_key_length
+      min = 2
+      completion.signal_connect('match-selected') do |c, model, iter|
+        cur_text = c.entry.text
+        new_tag = model.get_value(iter, 0)
+        cur_text_split = cur_text.split(',')
+        cur_text_split.delete_at(-1)
+        cur_text_split << new_tag
+        c.entry.text = cur_text_split.join(',')
+        true
+      end
+      completion.set_match_func do |_comp, key, iter|
+        cur_tag = key.split(',').last.strip
+        if cur_tag.size >= min
+          begin
+            if iter[0] =~ /^#{cur_tag}/
+              true
+            else
+              false
+            end
+          rescue
             false
           end
-        rescue
+        else
           false
         end
-      else
-        false
       end
     end
-  end
 
-  private
+    private
 
-  def complete(model_id)
-    completion = Gtk::EntryCompletion.new
-    model = Alexandria::UI::CompletionModels.instance.models[model_id]
-    completion.model = model
-    completion.text_column = 0
-    self.completion = completion
+    def complete(model_id)
+      completion = Gtk::EntryCompletion.new
+      model = Alexandria::UI::CompletionModels.instance.models[model_id]
+      completion.model = model
+      completion.text_column = 0
+      self.completion = completion
+    end
   end
 end
 
+Gtk::Entry.prepend Alexandria::EntryOverrides
+
 begin
   require 'revolution'
 
@@ -97,14 +101,14 @@ begin
         last = nil if last.empty?
       end
 
-      first and last ? first + ' ' + last : first ? first : last
+      first && last ? first + ' ' + last : first ? first : last
     end
 rescue LoadError => e
   Alexandria.log.debug { 'Could not find optional ruby-revolution; Evolution contacts will not be loaded' }
-  EVOLUTION_CONTACTS = []
+  EVOLUTION_CONTACTS = [].freeze
 rescue => e
   Alexandria.log.warn { e.message }
-  EVOLUTION_CONTACTS = []
+  EVOLUTION_CONTACTS = [].freeze
 end
 
 module Alexandria

data/lib/alexandria/ui/dialogs/about_dialog.rb

@@ -21,7 +21,7 @@ module Alexandria
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      GPL = <<EOL
+      GPL = <<EOL.freeze
 Alexandria is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License as
 published by the Free Software Foundation; either version 2 of the

data/lib/alexandria/ui/dialogs/acquire_dialog.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -47,7 +47,7 @@ module Alexandria
 
       def end_search
         synchronize do
-          @count -= 1 unless (@count == 0)
+          @count -= 1 unless @count.zero?
         end
       end
     end
@@ -136,16 +136,6 @@ module Alexandria
                 isbns << isbn
               end
             end
-            # remove list items (complex, cf. tutorial...)
-            # http://ruby-gnome2.sourceforge.jp/hiki.cgi?tut-treeview-model-remove
-            # row_refs = []
-            # paths = selection.selected_rows
-            # paths.each do |path|
-            #    row_refs << Gtk::TreeRowReference.new(model, path)
-            # end
-            # row_refs.each do |ref|
-            #    model.remove(model.get_iter(ref.path))
-            # end
 
             # try it this way... works because of persistent iters
             row_iters = []
@@ -154,13 +144,6 @@ module Alexandria
               isbn = iter[0]
               if book_in_library(isbn, library)
                 log.debug { "#{isbn} is a duplicate" }
-                # #elsif isbns.include? isbn
-                # this won't work since multiple scans of the same
-                # book have the same isbn (so we can't refrain from removing
-                # one, we'd end up not removing any)
-                ## TODO add another column in the iter, like "isbn/01"
-                # that would allow this kind of behaviour...
-
               elsif !@book_results.key?(isbn) # HAX
                 log.debug { "no book found for #{isbn}, not adding" }
 
@@ -197,8 +180,8 @@ module Alexandria
               end
             end
             # remove list items
-            if isbn_duplicates.empty? and !adding_a_selection
-              model.clear # TODO unless!!!
+            if isbn_duplicates.empty? && !adding_a_selection
+              model.clear # TODO: unless!!!
               row_iters.clear
             else
               row_iters.each do |iter|
@@ -266,7 +249,7 @@ module Alexandria
           barcode_text = @scanner.decode(@scanner_buffer)
           log.debug { "got barcode text #{barcode_text}" }
           isbn = Library.canonicalise_isbn(barcode_text)
-          # TODO :: use an AppFacade
+          # TODO: : use an AppFacade
           # isbn =  LookupBook.get_isbn(barcode_text)
         rescue StandardError => err
           log.error { "Bad scan:  #{@scanner_buffer} #{err}" }
@@ -293,11 +276,12 @@ module Alexandria
       # begin copy-n-paste from new_book_dialog
 
       def notify_start_add_by_isbn
-        Gtk.idle_add do
+        GLib::Idle.add do
           main_progress_bar = MainApp.instance.appbar.children.first
           main_progress_bar.visible = true
-          @progress_pulsing = Gtk.timeout_add(100) do
+          @progress_pulsing = GLib::Timeout.add(100) do
             if @destroyed
+              @progress_pulsing = nil
               false
             else
               main_progress_bar.pulse
@@ -309,15 +293,15 @@ module Alexandria
       end
 
       def notify_end_add_by_isbn
-        Gtk.idle_add do
+        GLib::Idle.add do
           MainApp.instance.appbar.children.first.visible = false
-          Gtk.timeout_remove(@progress_pulsing) if @progress_pulsing
+          GLib::Source.remove(@progress_pulsing) if @progress_pulsing
           false
         end
       end
 
       def update(status, provider)
-        Gtk.idle_add do
+        GLib::Idle.add do
           messages = {
             searching: _("Searching Provider '%s'..."),
             error: _("Error while Searching Provider '%s'"),
@@ -326,7 +310,6 @@ module Alexandria
           }
           message = messages[status] % provider
           log.debug { "update message : #{message}" }
-          # @parent.appbar.status = message
           MainApp.instance.ui_manager.set_status_label(message)
           false
         end
@@ -338,7 +321,7 @@ module Alexandria
 
       def start_search
         @search_thread_counter.synchronize do
-          if @search_thread_counter.count == 0
+          if @search_thread_counter.count.zero?
             @search_thread_counter.new_search
             @progress_bar_thread = Thread.new do
               notify_start_add_by_isbn
@@ -373,7 +356,7 @@ module Alexandria
             cover_uri = results[1]
             @book_results[isbn] = results
             set_cover_image_async(isbn, cover_uri)
-            # TODO add this as a block to Gtk.queue (needs new overall gui design)
+
             @barcodes_treeview.model.freeze_notify do
               @barcodes_treeview.model.each do |model, path, iter|
                 if iter[0] == isbn
@@ -406,7 +389,7 @@ module Alexandria
               else
                 image_data = URI.parse(cover_uri).read
               end
-              loader = Gdk::PixbufLoader.new
+              loader = GdkPixbuf::PixbufLoader.new
               loader.last_write(image_data)
               pixbuf = loader.pixbuf
             else
@@ -435,7 +418,7 @@ module Alexandria
       def on_destroy
         MainApp.instance.ui_manager.set_status_label('')
         notify_end_add_by_isbn
-        # TODO possibly make sure all threads have stopped running
+        # TODO: possibly make sure all threads have stopped running
         @animation.destroy
       end
 
@@ -443,7 +426,7 @@ module Alexandria
         @scanner_buffer = ''
         scanner_name = @prefs.barcode_scanner
 
-        @acanner = Alexandria::Scanners.find_scanner scanner_name ||
+        @scanner = Alexandria::Scanners.find_scanner scanner_name ||
           Alexandria::Scanners.default_scanner # CueCat is default
 
         log.debug { "Using #{@scanner.name} scanner" }
@@ -515,7 +498,7 @@ module Alexandria
 
               Thread.new(@interval, @scanner_buffer) do |interval, buffer|
                 log.debug { 'Waiting for more scanner input...' }
-                Gtk.idle_add do
+                GLib::Idle.add do
                   @animation.manual_input
                   false
                 end
@@ -523,7 +506,7 @@ module Alexandria
                 sleep(time_to_wait)
                 if buffer == @scanner_buffer
                   log.debug { 'Buffer unchanged; scanning complete' }
-                  Gtk.idle_add do
+                  GLib::Idle.add do
                     @animation.scanner_input
                     false
                   end
@@ -550,24 +533,15 @@ module Alexandria
       end
 
       def play_sound(effect)
-        # HACK, do some thread waiting, if possible
-        puts "scanning sound : #{@prefs.play_scanning_sound}"
-        puts "scan sound:      #{@prefs.play_scan_sound}"
         if effect == 'scanning'
-          puts effect
+          puts "Effect: #{effect}, playing: #{@prefs.play_scanning_sound}" if $DEBUG
           return unless  @prefs.play_scanning_sound
-          Gtk.idle_add do
-            @sound_players['scanning'].play('scanning')
-            false
-          end
+          @sound_players['scanning'].play('scanning')
         else
-          puts effect
+          puts "Effect: #{effect}, playing: #{@prefs.play_scan_sound}" if $DEBUG
           return unless @prefs.play_scan_sound
-          Gtk.idle_add do
-            # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
-            @sound_players[effect].play(effect)
-            false
-          end
+          # sleep(0.5) # "scanning" effect lasts 0.5 seconds, wait for it to end
+          @sound_players[effect].play(effect)
         end
       end
 
@@ -590,9 +564,9 @@ module Alexandria
       end
 
       def init_treeview
-        liststore = Gtk::ListStore.new(String, Gdk::Pixbuf, String)
+        liststore = Gtk::ListStore.new(String, GdkPixbuf::Pixbuf, String)
 
-        @barcodes_treeview.selection.mode = Gtk::SELECTION_MULTIPLE
+        @barcodes_treeview.selection.mode = :multiple
 
         @barcodes_treeview.model = liststore
 

data/lib/alexandria/ui/dialogs/alert_dialog.rb

@@ -20,23 +20,24 @@ module Alexandria
   module UI
     class AlertDialog < Gtk::Dialog
       def initialize(parent, title, stock_icon, buttons, message = nil)
-        super('', parent, Gtk::Dialog::DESTROY_WITH_PARENT, *buttons)
+        super(title: '', parent: parent, flags: :destroy_with_parent, buttons: buttons)
 
         self.border_width = 6
         self.resizable = false
-        self.has_separator = false
-        vbox.spacing = 12
+        child.spacing = 12
 
-        hbox = Gtk::HBox.new(false, 12)
+        hbox = Gtk::Box.new(:horizontal, 12)
+        hbox.homogeneous = false
         hbox.border_width = 6
-        vbox.pack_start(hbox)
+        child.pack_start(hbox)
 
-        image = Gtk::Image.new(stock_icon,
-                               Gtk::IconSize::DIALOG)
+        image = Gtk::Image.new(stock: stock_icon,
+                               size: Gtk::IconSize::DIALOG)
         image.set_alignment(0.5, 0)
         hbox.pack_start(image)
 
-        vbox = Gtk::VBox.new(false, 6)
+        vbox = Gtk::Box.new(:vertical, 6)
+        vbox.homogeneous = false
         hbox.pack_start(vbox)
 
         label = Gtk::Label.new
@@ -58,9 +59,10 @@ module Alexandria
     class ErrorDialog < AlertDialog
       def initialize(parent, title, message = nil)
         super(parent, title, Gtk::Stock::DIALOG_ERROR,
-              [[Gtk::Stock::OK, Gtk::Dialog::RESPONSE_OK]], message)
-        self.default_response = Gtk::Dialog::RESPONSE_OK
-        show_all and run
+              [[Gtk::Stock::OK, :ok]], message)
+        # FIXME: Should accept just :ok
+        self.default_response = Gtk::ResponseType::OK
+        show_all && run
         destroy
       end
     end

data/lib/alexandria/ui/dialogs/bad_isbns_dialog.rb

@@ -22,8 +22,8 @@ module Alexandria
     class BadIsbnsDialog < Gtk::MessageDialog
       def initialize(parent, message = nil, list = nil)
         message = _("There's a problem") unless message
-        super(parent, Gtk::Dialog::MODAL, Gtk::MessageDialog::WARNING,  Gtk::MessageDialog::BUTTONS_CLOSE, message)
-        isbn_container = Gtk::HBox.new
+        super(parent, Gtk::Dialog::MODAL, Gtk::MessageDialog::WARNING, Gtk::MessageDialog::BUTTONS_CLOSE, message)
+        isbn_container = Gtk::Box.new :horizontal
         the_vbox = children.first
         the_vbox.pack_start(isbn_container)
         the_vbox.reorder_child(isbn_container, 3)

data/lib/alexandria/ui/dialogs/barcode_animation.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 #--
 # Copyright (C) 2011 Cathal Mc Ginley
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2016 Matijs van Zuijlen
 #
 # This file is part of Alexandria, a GNOME book collection manager.
 #
@@ -21,7 +21,29 @@
 # Boston, MA 02110-1301 USA.
 #++
 
-# require 'goocanvas'
+require 'gobject-introspection'
+
+module GooCanvas
+  class << self
+    def const_missing(name)
+      init
+      if const_defined?(name)
+        const_get(name)
+      else
+        super
+      end
+    end
+
+    def init
+      class << self
+        remove_method(:init)
+        remove_method(:const_missing)
+      end
+      loader = GObjectIntrospection::Loader.new(self)
+      loader.load('GooCanvas')
+    end
+  end
+end
 
 module Alexandria
   module UI
@@ -29,7 +51,7 @@ module Alexandria
       attr_reader :canvas
 
       def initialize
-        @canvas = Goo::Canvas.new
+        @canvas = GooCanvas::Canvas.new
         @canvas.set_size_request(300, 70)
         @canvas.set_bounds(0, 0, 350, 70)
         @root = @canvas.root_item
@@ -55,7 +77,7 @@ module Alexandria
       end
 
       def start
-        @timeout = Gtk.timeout_add(20) do
+        @timeout = GLib::Timeout.add(20) do
           scan_animation
           (@index >= 0)
         end
@@ -80,12 +102,12 @@ module Alexandria
       end
 
       def manual_input
-        # TODO distinguish between scanner and manual input
+        # TODO: distinguish between scanner and manual input
         # @canvas.set_property(:background_color, "#FFF8C0")
       end
 
       def scanner_input
-        # TODO distinguish between scanner and manual input
+        # TODO: distinguish between scanner and manual input
         # @canvas.set_property(:background_color, "white")
       end
 
@@ -94,7 +116,7 @@ module Alexandria
       def create_ean_barcode_data
         d = '211113123121112331122131113211111123122211132321112311231111'
         # ####911113... but that's too much padding on the left...
-        while d.size > 0
+        until d.empty?
           space_width = d[0].chr.to_i
           bar_width = d[1].chr.to_i
           d = d[2..-1]
@@ -105,11 +127,11 @@ module Alexandria
       def draw_barcode_bars
         @barcode_data.each do |space_width, bar_width|
           @hpos += space_width
-          rect_item = Goo::CanvasRect.new(@root,
-                                          @bar_left_edge + @scale * @hpos, @bar_top,
-                                          @scale * bar_width, @bar_height,
-                                          line_width: 0,
-                                          fill_color: 'white')
+          rect_item = GooCanvas::CanvasRect.new(parent: @root,
+                                                x: @bar_left_edge + @scale * @hpos, y: @bar_top,
+                                                width: @scale * bar_width, height: @bar_height,
+                                                line_width: 0,
+                                                fill_color: 'white')
           @hpos += bar_width
           @barcode_bars << rect_item
         end
@@ -117,22 +139,18 @@ module Alexandria
 
       def scan_animation
         if @index < @barcode_bars.size
-          if @index < 0
-            @index = 0
-          end
+          @index = 0 if @index < 0
           alpha = 7 * (@index + 1)
           @barcode_bars.each_with_index do |rect, i|
             rect.set_property(:fill_color_rgba, 0xFF000000 + alpha)
-            if i >= @index
-              break
-            end
+            break if i >= @index
           end
           @index += 1
         else
           @index = -1
-          Gtk.timeout_add(5) do
+          GLib::Timeout.add(5) do
             @barcode_bars.each { |rect| rect.set_property(:fill_color_rgba, 0x000000C0) }
-            Gtk.timeout_add(15) do
+            GLib::Timeout.add(15) do
               fade_animation
               (@fade_opacity != -1)
             end
@@ -143,9 +161,7 @@ module Alexandria
       end
 
       def fade_animation
-        if @fade_opacity == -1
-          @fade_opacity = 255
-        end
+        @fade_opacity = 255 if @fade_opacity == -1
         if @fade_opacity >= 0
           grey = 0x00000000 + @fade_opacity
           @barcode_bars.each { |rect| rect.set_property(:fill_color_rgba, grey) }