Ticket #3764: GetBooks_Internet_Archive_Catalog_Support.patch

GetBooks.activity/get-books.cfg

@@ -22 +22 @@
 name = Internet Archive
 query_uri = http://bookserver.archive.org/catalog/opensearch?q=
 opds_cover = http://opds-spec.org/image
-#opds_cover = http://opds-spec.org/image/thumbnail
+
+[Catalogs_Internet Archive]
+Index = http://bookserver.archive.org/catalog/
+
+[Ceibal]
+name = Ceibal
+query_uri = http://biblioteca.ceibal.edu.uy/latest.atom?q=
+opds_cover = http://opds-spec.org/cover
+summary_field = summary
+
+[Catalogs_Ceibal]
+indice = http://biblioteca.ceibal.edu.uy/static_media/catalogo_inicial.htm

GetBooks.activity/GetIABooksActivity.py

@@ -78 +78 @@
         self.show_images = True
         self.languages = {}
         self._lang_code_handler = languagenames.LanguageNames()
-        self.catalogs = {}
+        self.catalogs_configuration = {}
         self.catalog_history = []
 
         if os.path.exists('/etc/get-books.cfg'):
@@ -210 +210 @@
 
                 _SOURCES_CONFIG[section] = repo_config
 
+        self.source = _SOURCES_CONFIG.keys()[0]
+
         logging.error('_SOURCES %s', _SOURCES)
         logging.error('_SOURCES_CONFIG %s', _SOURCES_CONFIG)
 
@@ -230 +232 @@
                     catalog_config['name'] = catalog
                     catalog_config['summary_field'] = \
                         source_config['summary_field']
-                    self.catalogs[catalog] = catalog_config
+                    self.catalogs_configuration[catalog] = catalog_config
+
+
+        self.catalogs = {}
+        for catalog_key in self.catalogs_configuration:
+            catalog = self.catalogs_configuration[catalog_key]
+            if catalog['source'] == self.source:
+                self.catalogs[catalog_key]=catalog
 
         logging.error('languages %s', self.languages)
         logging.error('catalogs %s', self.catalogs)
@@ -498 +507 @@
         self.bt_move_up_catalog.hide_image()
         self.treecol.set_widget(self.bt_move_up_catalog)
 
-        if len(self.catalogs) > 0:
-            self.catalog_history.append({'title': _('Catalogs'),
-                'catalogs': self.catalogs})
-            self.categories = []
-            self.path_iter = {}
-            for key in self.catalogs.keys():
-                self.categories.append({'text': key, 'dentro': []})
-            self.treemodel.clear()
-            for p in self.categories:
-                self.path_iter[p['text']] = self.treemodel.append([p['text']])
+        self.load_source_catalogs()
+
         self.tree_scroller = gtk.ScrolledWindow(hadjustment=None,
                 vadjustment=None)
         self.tree_scroller.set_policy(gtk.POLICY_NEVER,
@@ -865 +866 @@
         else:
             self.catalog_history.pop()
 
+    def load_source_catalogs(self):
+        self.catalogs = {}
+
+        for catalog_key in self.catalogs_configuration:
+            catalog = self.catalogs_configuration[catalog_key]
+            if catalog['source'] == self.source:
+                self.catalogs[catalog_key]=catalog
+
+        if len(self.catalogs) > 0:
+            self.categories = []
+            self.path_iter = {}
+            self.catalog_history = []
+            self.catalog_history.append({'title': _('Catalogs'),
+                'catalogs': self.catalogs})
+            for key in self.catalogs.keys():
+                self.categories.append({'text': key, 'dentro': []})
+            self.treemodel.clear()
+
+            for p in self.categories:
+                self.path_iter[p['text']] = self.treemodel.append([p['text']])
+
+
     def __source_changed_cb(self, widget):
         search_terms = self.get_search_terms()
         if search_terms == '':
@@ -873 +896 @@
             self.find_books(search_terms)
         # enable/disable catalogs button if configuration is available
         self.source = self._books_toolbar.source_combo.props.value
-        have_catalogs = False
-        for catalog_name in self.catalogs.keys():
-            catalog_config = self.catalogs[catalog_name]
-            if catalog_config['source'] == self.source:
-                have_catalogs = True
-                break
-        if have_catalogs:
+                # Get catalogs for this source
+        self.load_source_catalogs()
+
+        if len(self.catalogs)>0:
             self.bt_catalogs.show()
             self.bt_catalogs.set_active(True)
         else:

GetBooks.activity/opds.py

@@ -38 +38 @@
 _REL_SUBSECTION = 'subsection'
 _REL_OPDS_POPULAR = u'http://opds-spec.org/sort/popular'
 _REL_OPDS_NEW = u'http://opds-spec.org/sort/new'
+_REL_ALTERNATE = 'alternate'
+_REL_CRAWLABLE = 'http://opds-spec.org/crawlable'
 
 gobject.threads_init()
 
@@ -91 +93 @@
         else:
             feedobj = feedparser.parse(self.obj._uri)
 
+                # Get catalog Type
+        CATALOG_TYPE = 'COMMON'
+        if 'links' in feedobj['feed']:         
+            for link in feedobj['feed']['links']:
+                if link['rel'] == _REL_CRAWLABLE:        
+                    CATALOG_TYPE = 'CRAWLABLE'
+                    break                 
+                    
         for entry in feedobj['entries']:
-            if entry_type(entry) == 'BOOK':
+            if entry_type(entry) == 'BOOK' and CATALOG_TYPE is not 'CRAWLABLE':
                 self.obj._booklist.append(Book(self.obj._configuration, entry))
-            elif entry_type(entry) == 'CATALOG':
+            elif entry_type(entry) == 'CATALOG' or CATALOG_TYPE == 'CRAWLABLE':
                 self.obj._cataloglist.append( \
                     Book(self.obj._configuration, entry))
 
@@ -147 +157 @@
             elif link['rel'] in \
             [_REL_OPDS_POPULAR, _REL_OPDS_NEW, _REL_SUBSECTION]:
                 ret[link['type']] = link['href']
+            elif link['rel'] == _REL_ALTERNATE:
+                ret[link['type']] = link['href']
             else:
                 pass
         return ret