From a300e3ef96e0022536bd2c8be919ce3b72acc5be Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 16 Feb 2009 11:23:19 -0800
Subject: [PATCH] Fix #1857 (Recognize .azw extension as a mobi file)

---
 .pydevproject                               | 2 +-
 src/calibre/customize/builtins.py           | 2 +-
 src/calibre/gui2/dialogs/metadata_single.py | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.pydevproject b/.pydevproject
index b6d22db5e1..aaa4cc3986 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -2,7 +2,7 @@
 <?eclipse-pydev version="1.0"?>
 
 <pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.6</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.5</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/calibre/src</path>
 </pydev_pathproperty>
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 625a4035d0..a40878480f 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -132,7 +132,7 @@ class HTMLMetadataReader(MetadataReaderPlugin):
 class MOBIMetadataReader(MetadataReaderPlugin):
     
     name        = 'Read MOBI metadata'
-    file_types  = set(['mobi', 'prc'])
+    file_types  = set(['mobi', 'prc', '.azw'])
     description = _('Read metadata from %s files')%'MOBI'
     
     def get_metadata(self, stream, ftype):
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 78415f3a19..519314782a 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -269,7 +269,7 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
     def cover_dropped(self):
         self.cover_changed = True
     
-    def initialize_series_and_publisher(self):
+    def initialize_series(self):
         all_series = self.db.all_series()
         all_series.sort(cmp=lambda x, y : cmp(x[1], y[1]))
         series_id = self.db.series_id(self.row)
@@ -293,6 +293,8 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                 l.invalidate()
                 l.activate()
         
+    def initialize_series_and_publisher(self):
+        self.initialize_series()
         all_publishers = self.db.all_publishers()
         all_publishers.sort(cmp=lambda x, y : cmp(x[1], y[1]))
         publisher_id = self.db.publisher_id(self.row)