alexandria-book-collection-manager 0.6.9.pre1 → 0.6.9

data/lib/alexandria/ui/callbacks.rb

@@ -125,8 +125,8 @@ module Alexandria
       rescue => ex
         log.error { "problem with immediate export #{ex} try again" }
         ErrorDialog.new(@main_app, _('Export failed'),
-                           _('Try letting this library load ' \
-                             'completely before exporting.'))
+                        _('Try letting this library load ' \
+                          'completely before exporting.'))
       end
 
       def on_acquire(_widget, _event)

data/lib/alexandria/ui/completion_models.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -68,9 +68,7 @@ class Gtk::Entry
     end
   end
 
-  #######
   private
-  #######
 
   def complete(model_id)
     completion = Gtk::EntryCompletion.new
@@ -86,20 +84,21 @@ begin
 
   EVOLUTION_CONTACTS =
     Revolution::Revolution.new.get_all_contacts.map do |contact|
-    first, last = contact.first_name, contact.last_name
+      first = contact.first_name
+      last = contact.last_name
 
-    if first
-      first.strip!
-      first = nil if first.empty?
-    end
+      if first
+        first.strip!
+        first = nil if first.empty?
+      end
 
-    if last
-      last.strip!
-      last = nil if last.empty?
-    end
+      if last
+        last.strip!
+        last = nil if last.empty?
+      end
 
-    first and last ? first + ' ' + last : first ? first : last
-  end
+      first and 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 = []
@@ -116,7 +115,8 @@ module Alexandria
       TITLE, AUTHOR, PUBLISHER, EDITION, BORROWER, TAG = (0..6).to_a
 
       def initialize
-        @models, @libraries = [], []
+        @models = []
+        @libraries = []
         5.times { @models << Gtk::ListStore.new(String) }
         @models << Gtk::ListStore.new(String)
         touch
@@ -174,9 +174,7 @@ module Alexandria
         @models[TAG]
       end
 
-      #######
       private
-      #######
 
       def touch
         @dirty = true
@@ -187,7 +185,11 @@ module Alexandria
       end
 
       def rebuild_models
-        titles, authors, publishers, editions, borrowers = [], [], [], [], []
+        titles = []
+        authors = []
+        publishers = []
+        editions = []
+        borrowers = []
         tags = []
         @libraries.each do |library|
           library.each do |book|
@@ -196,7 +198,8 @@ module Alexandria
             publishers << book.publisher
             editions << book.edition
             borrowers << book.loaned_to
-            book.tags.each { |tag| tags << tag }
+            # TODO: Ensure #tags is always an array
+            (book.tags || []).each { |tag| tags << tag }
           end
         end
 

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

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -174,7 +174,6 @@ module Alexandria
               log.debug { "removing iter #{iter[0]}" }
               model.remove(iter)
             end
-
           end
         else
           model.freeze_notify do
@@ -553,7 +552,7 @@ module Alexandria
       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}"
+        puts "scan sound:      #{@prefs.play_scan_sound}"
         if effect == 'scanning'
           puts effect
           return unless  @prefs.play_scanning_sound
@@ -620,7 +619,6 @@ module Alexandria
 
             cell.pixbuf = pixbuf
           end
-
         end
 
         @barcodes_treeview.append_column(col)

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

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 #--
 # Copyright (C) 2011 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 Matijs van Zuijlen
 #
 # This file is part of Alexandria, a GNOME book collection manager.
 #

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

@@ -109,9 +109,7 @@ module Alexandria
         end
       end
 
-      #######
       private
-      #######
 
       def on_close
         if @entry_isbn.text == ''
@@ -203,7 +201,7 @@ module Alexandria
 
       def on_help
         Alexandria::UI.display_help(@preferences_dialog,
-                                     'editing-book-properties')
+                                    'editing-book-properties')
       end
     end
   end

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

@@ -102,7 +102,6 @@ module Alexandria
             time = Time.gm(year, month, day)
             @calendar_popup_for_entry.text = format_date(time)
           end
-
         end
 
         @calendar.signal_connect('day-selected-double-click') do
@@ -146,7 +145,6 @@ module Alexandria
         @book_properties_dialog.modal = true
 
         Gtk.timeout_add(150) do
-
           # If we set @popup_displayed=false immediately, then a click
           # event on the primary icon of the Entry simultaneous with
           # the focus-out-event of the Calendar causes the Calendar to
@@ -370,9 +368,7 @@ module Alexandria
         end
       end
 
-      #######
       private
-      #######
 
       def rating=(rating)
         images = [

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

@@ -93,7 +93,7 @@ module Alexandria
         types_combo.signal_connect('changed') do
           theme_label.visible = theme_combo.visible =
             preview_image.visible =
-            FORMATS[types_combo.active].needs_preview?
+              FORMATS[types_combo.active].needs_preview?
         end
         types_combo.show
 
@@ -132,9 +132,7 @@ module Alexandria
         destroy
       end
 
-      #######
       private
-      #######
 
       def on_export(format, theme)
         unless @library.respond_to?(format.message)

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -135,8 +135,8 @@ module Alexandria
           file = File.basename(filename, '.*')
           base = GLib.locale_to_utf8(file)
           new_library_name = Library.generate_new_name(
-                                                       Libraries.instance.all_libraries,
-                                                       base)
+            Libraries.instance.all_libraries,
+            base)
 
           filter = filters[self.filter]
           puts "Going forward with filter: #{filter.name}" if $DEBUG
@@ -166,7 +166,7 @@ module Alexandria
           thread = Thread.start do
             begin
               library, @bad_isbns, @failed_isbns = filter.invoke(new_library_name,
-                                                  filename)
+                                                                 filename)
             rescue => ex
               trace = ex.backtrace.join("\n> ")
               log.error { "Import failed: #{ex.message} #{trace}" }

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -273,8 +273,10 @@ module Alexandria
 
         criterion = @entry_search.text.strip
         @treeview_results.model.clear
-        log.info { 'TreeStore Model: %s columns; ref_counts: %s' %
-                   [@treeview_results.model.n_columns, @treeview_results.model.ref_count] }
+        log.info {
+          'TreeStore Model: %s columns; ref_counts: %s' %
+            [@treeview_results.model.n_columns, @treeview_results.model.ref_count]
+        }
 
         @find_error = nil
         @results = nil
@@ -377,7 +379,7 @@ module Alexandria
       def on_results_button_press_event(_widget, event)
         # double left click
         if event.event_type == Gdk::Event::BUTTON2_PRESS and
-          event.button == 1
+            event.button == 1
 
           on_add
         end
@@ -396,7 +398,6 @@ module Alexandria
         @button_add.sensitive = false
         notify_start_add_by_isbn
         Gtk.idle_add do
-
           @find_thread = Thread.new do
             log.info { "New @find_thread #{Thread.current}" }
             begin
@@ -457,7 +458,6 @@ module Alexandria
             end
             books_to_add << [book, cover]
           end
-
         end
         books_to_add.each do |book, cover_uri|
           add_book_to_library(library, book, cover_uri)
@@ -573,9 +573,8 @@ module Alexandria
           clipboard = Gtk::Clipboard.get(Gdk::Selection::CLIPBOARD)
           if (text = clipboard.wait_for_text)
             if Library.valid_isbn?(text) or Library.valid_ean?(text) or
-              Library.valid_upc?(text)
+                Library.valid_upc?(text)
               Gtk.idle_add do
-
                 @entry_isbn.text = text
                 @entry_isbn.grab_focus
                 @entry_isbn.select_region(0, -1) # select all...
@@ -594,7 +593,7 @@ module Alexandria
 
       def on_clicked(widget, event)
         if event.event_type == Gdk::Event::BUTTON_PRESS and
-          event.button == 1
+            event.button == 1
 
           radio, target_widget, box2, box3 = case widget
                                              when @eventbox_entry_search
@@ -620,9 +619,7 @@ module Alexandria
         Alexandria::UI.display_help(@preferences_dialog, 'add-book-by-isbn')
       end
 
-      #######
       private
-      #######
 
       def assert_not_exist(library, isbn)
         # Check that the book doesn't already exist in the library.

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

@@ -65,9 +65,7 @@ module Alexandria
         end
       end
 
-      #######
       private
-      #######
 
       def on_cancel
         @book_properties_dialog.destroy
@@ -83,7 +81,8 @@ module Alexandria
         isbn = nil
         if @entry_isbn.text != ''
           ary = @library.select { |book|
-            book.ident == @entry_isbn.text }
+            book.ident == @entry_isbn.text
+          }
           raise AddError.new(_('The EAN/ISBN you provided is ' \
                                'already used in this library.')) unless ary.empty?
           isbn = begin
@@ -110,8 +109,8 @@ module Alexandria
                                'provided.'))
         end
         book = Book.new(title, authors, isbn, publisher,
-                       publishing_year == 0 ? nil : publishing_year,
-                       edition)
+                        publishing_year == 0 ? nil : publishing_year,
+                        edition)
         book.rating = @current_rating
         book.notes = @textview_notes.buffer.text
         book.loaned = @checkbutton_loaned.active?

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

@@ -1,4 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
+# Copyright (C) 2015 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
@@ -41,16 +42,10 @@ module Alexandria
           elsif response == Gtk::Dialog::RESPONSE_OK
             if user_confirms_possible_weirdnesses_before_saving?
               rules = smart_library_rules
-              basename = if rules.length == 1 and
-                             rules.first.value.is_a?(String) and
-                             !rules.first.value.strip.empty?
-                           rules.first.value
-                         else
-                           _('Smart Library')
-                         end
+              basename = smart_library_base_name(rules) || _('Smart Library')
               name = Library.generate_new_name(
-                                               Libraries.instance.all_libraries,
-                                               basename)
+                Libraries.instance.all_libraries,
+                basename)
               library = SmartLibrary.new(name,
                                          rules,
                                          predicate_operator_rule)
@@ -62,6 +57,17 @@ module Alexandria
 
         destroy
       end
+
+      private
+
+      def smart_library_base_name(rules)
+        if rules.length == 1
+          value = rules.first.value
+          if value.is_a?(String) and !value.strip.empty?
+            return value
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -193,9 +193,7 @@ module Alexandria
         @selected_instance
       end
 
-      #######
       private
-      #######
 
       def sensitize
         entries = @table.children.select { |x| x.is_a?(Gtk::Entry) }
@@ -242,8 +240,10 @@ module Alexandria
           if checkbutton
             checkbutton.active = Preferences.instance.send(pref_name)
           else
-            log.warn { "no CheckButton for property #{pref_name} " \
-              '(probably conflicting versions of GUI and lib code)' }
+            log.warn {
+              "no CheckButton for property #{pref_name} " \
+              '(probably conflicting versions of GUI and lib code)'
+            }
           end
         end
 
@@ -355,7 +355,6 @@ module Alexandria
           prov = selected_provider
           prov.toggle_enabled
           adjust_selected_provider(prov)
-
         }
         @enable_disable_providers_menu.append(@enable_item)
         @enable_disable_providers_menu.show_all
@@ -387,21 +386,21 @@ module Alexandria
 
         # Popup the menu on Shift-F10
         @treeview_providers.signal_connect('popup_menu') {
-            selected_prov = @treeview_providers.selection.selected
-            puts selected_prov.inspect
-            if selected_prov
-              Gtk.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, Gdk::Event::CURRENT_TIME)
-                false
-              end
-            else
-              puts 'no action'
+          selected_prov = @treeview_providers.selection.selected
+          puts selected_prov.inspect
+          if selected_prov
+            Gtk.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, Gdk::Event::CURRENT_TIME)
+              false
             end
-          }
+          else
+            puts 'no action'
+          end
+        }
       end
 
       def event_is_right_click(event)
@@ -515,12 +514,10 @@ module Alexandria
 
       def on_help
         Alexandria::UI.display_help(@preferences_dialog,
-                                     'alexandria-preferences')
+                                    'alexandria-preferences')
       end
 
-      #######
       private
-      #######
 
       def reload_providers
         model = @treeview_providers.model