Preference widget for adding books

src/calibre/customize/builtins.py

@@ -739,8 +739,17 @@ class OutputOptions(PreferencesPlugin):
     name_order = 3
     config_widget = 'calibre.gui2.preferences.conversion:OutputOptions'
 
+class Adding(PreferencesPlugin):
+    name = 'Adding'
+    gui_name = _('Adding books')
+    category = 'Import/Export'
+    gui_category = _('Import/Export')
+    category_order = 3
+    name_order = 1
+    config_widget = 'calibre.gui2.preferences.adding'
+
 plugins += [LookAndFeel, Behavior, Columns, Toolbar, InputOptions,
-        CommonOptions, OutputOptions]
+        CommonOptions, OutputOptions, Adding]
 
 #}}}
 

src/calibre/gui2/preferences/adding.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# vim:fileencoding=UTF-8:ts=4:sw=4:sta:et:sts=4:ai
+
+__license__   = 'GPL v3'
+__copyright__ = '2010, Kovid Goyal <kovid@kovidgoyal.net>'
+__docformat__ = 'restructuredtext en'
+
+
+
+from calibre.gui2.preferences import ConfigWidgetBase, test_widget
+from calibre.gui2.preferences.adding_ui import Ui_Form
+from calibre.utils.config import prefs
+from calibre.gui2.widgets import FilenamePattern
+
+class ConfigWidget(ConfigWidgetBase, Ui_Form):
+
+    def genesis(self, gui):
+        self.gui = gui
+
+        r = self.register
+
+        r('read_file_metadata', prefs)
+        r('swap_author_names', prefs)
+        r('add_formats_to_existing', prefs)
+
+        self.filename_pattern = FilenamePattern(self)
+        self.metadata_box.layout().insertWidget(0, self.filename_pattern)
+        self.filename_pattern.changed_signal.connect(self.changed_signal.emit)
+
+
+    def initialize(self):
+        ConfigWidgetBase.initialize(self)
+        self.filename_pattern.blockSignals(True)
+        self.filename_pattern.initialize()
+        self.filename_pattern.blockSignals(False)
+
+    def restore_defaults(self):
+        ConfigWidgetBase.restore_defaults(self)
+        self.filename_pattern.initialize(defaults=True)
+
+    def commit(self):
+        pattern = self.filename_pattern.commit()
+        prefs['filename_pattern'] = pattern
+        return ConfigWidgetBase.commit(self)
+
+if __name__ == '__main__':
+    from PyQt4.Qt import QApplication
+    app = QApplication([])
+    test_widget('Import/Export', 'Adding')
+

src/calibre/gui2/preferences/adding.ui

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QWidget" name="Form">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>1010</width>
+    <height>339</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label_6">
+     <property name="text">
+      <string>Here you can control how calibre will read metadata from the files you add to it. calibre can either read metadata from the contents of the file, or from the filename.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="opt_read_file_metadata">
+     <property name="text">
+      <string>Read metadata from &amp;file contents rather than file name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QCheckBox" name="opt_add_formats_to_existing">
+     <property name="toolTip">
+      <string>If an existing book with a similar title and author is found that does not have the format being added, the format is added
+to the existing book, instead of creating a new entry. If the existing book already has the format, then it is silently ignored.
+
+Title match ignores leading indefinite articles (&quot;the&quot;, &quot;a&quot;, &quot;an&quot;), punctuation, case, etc. Author match is exact.</string>
+     </property>
+     <property name="text">
+      <string>If books with similar titles and authors found, &amp;merge the new files automatically</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QGroupBox" name="metadata_box">
+     <property name="title">
+      <string>&amp;Configure metadata from file name</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <spacer name="verticalSpacer">
+        <property name="orientation">
+         <enum>Qt::Vertical</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>20</width>
+          <height>363</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="opt_swap_author_names">
+     <property name="toolTip">
+      <string>Swap the firstname and lastname of the author. This affects only metadata read from file names.</string>
+     </property>
+     <property name="text">
+      <string>&amp;Swap author firstname and lastname</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/calibre/gui2/widgets.py

@@ -61,13 +61,24 @@ class ProgressIndicator(QWidget):
 
 class FilenamePattern(QWidget, Ui_Form):
 
+    changed_signal = pyqtSignal()
+
     def __init__(self, parent):
         QWidget.__init__(self, parent)
         self.setupUi(self)
 
         self.connect(self.test_button, SIGNAL('clicked()'), self.do_test)
         self.connect(self.re, SIGNAL('returnPressed()'), self.do_test)
-        self.re.setText(prefs['filename_pattern'])
+        self.initialize()
+        self.re.textChanged.connect(lambda x: self.changed_signal.emit())
+
+    def initialize(self, defaults=False):
+        if defaults:
+            val = prefs.defaults['filename_pattern']
+        else:
+            val = prefs['filename_pattern']
+        self.re.setText(val)
+
 
     def do_test(self):
         try: