use gitenberg.metadata

core/bookloader.py

@@ -18,7 +18,7 @@ from django.contrib.comments.models import Comment
 from django.db import IntegrityError
 from django.db.models import Q
 
-from .pandata import Pandata
+from gitenberg.metadata.pandata import Pandata
 from ..marc.models import inverse_marc_rels
 
 """
@@ -869,6 +869,6 @@ def git_download_from_yaml_url(yaml_url, version, edition_name='book'):
     # to https://github.com/GITenberg/Adventures-of-Huckleberry-Finn_76/releases/download/v0.0.3/Adventures-of-Huckleberry-Finn.epub
     if yaml_url.endswith('raw/master/metadata.yaml'):
         repo_url = yaml_url[0:-24]
-        print (repo_url,version,edition_name)
+        #print (repo_url,version,edition_name)
         ebook_url = repo_url + 'releases/download/v' + version + '/' + edition_name + '.epub'
         return ebook_url

core/pandata.py

@@ -1,106 +0,0 @@
-import yaml
-import json
-import requests
-import httplib
-import datetime
-
-def subject_constructor(loader, node):
-    return (node.tag[1:] , loader.construct_scalar(node))
-
-yaml.add_constructor(u'!lcsh', subject_constructor)
-yaml.add_constructor(u'!lcc', subject_constructor)
-
-PANDATA_STRINGFIELDS = [
-    '_repo',
-    'description',
-    'funding_info',
-    'gutenberg_issued',
-    'language',
-    'publication_date_original',
-    'publisher_original',
-    'rights',
-    'rights_url',
-    'title',
-    ]
-    
-PANDATA_AGENTFIELDS = [
-    'authors',
-    'editors_of_a_compilation',
-    'translators',
-    'illustrators',
-    ]
-PANDATA_LISTFIELDS = PANDATA_AGENTFIELDS + [
-    'subjects', 'covers',
-    ]
-PANDATA_DICTFIELDS = [
-    'identifiers', 'creator', 'contributor'
-    ]
-    
-def edition_name_from_repo(repo):
-    if '_' in repo:
-        return '_'.join(repo.split('_')[0:-1])
-    return repo
-    
-# wrapper class for the json object 
-class Pandata(object):
-    def __init__(self, datafile):
-        if datafile.startswith('https://') or datafile.startswith('https://'):
-            r = requests.get(datafile)
-            if r.status_code == httplib.OK:
-                self.metadata = yaml.load( r.content)
-        else:
-            self.metadata = yaml.load(file(datafile, 'r'))
-    
-    def __getattr__(self, name):
-        if name in PANDATA_STRINGFIELDS:
-            value = self.metadata.get(name, '')
-            if isinstance(value, str):
-                return value
-        if name in PANDATA_LISTFIELDS:
-            return self.metadata.get(name, [])
-        if name in PANDATA_DICTFIELDS:
-            return self.metadata.get(name, {})
-        return self.metadata.get(name, None)
-    
-    def agents(self, agent_type):
-        agents = self.metadata.get(agent_type, [])
-        return agents if agents else []
-        
-    # the edition should be able to report ebook downloads, which should have format and url attributes
-    def downloads(self):
-        return []
-
-    # the edition should be able to report an "ebook via" url
-    def download_via_url(self):
-        return []
-
-    # these should be last name first
-    def authnames(self):
-        return [auth.get('author_sortname','') for auth in self.authors]
-    
-    # some logic to decide
-    @property
-    def publication_date(self):
-        if self.__getattr__("publication_date"):
-            return  self.__getattr__("publication_date")
-        elif self.__getattr__("gutenberg_issued"):
-            return self.__getattr__("gutenberg_issued")
-        else:
-            return datetime.datetime.now().date()
-    
-    # gets the right edition. stub method for compatibility with marc converter
-    @staticmethod   
-    def get_by_isbn(isbn):
-        return None
-
-    @property
-    def _edition(self):
-        print 'start _edition'
-        if self.metadata.get("_edition", ''):
-            return self.metadata["_edition"]
-        elif self.identifiers.get("isbn", ''):
-            return str(self.metadata.indentifiers['isbn'][0])  #use first isbn if available
-        elif self._repo:
-            return edition_name_from_repo(self._repo)
-        else:
-            return 'book'  #this will be the default file name

requirements_versioned.pip

@@ -39,7 +39,8 @@ django-storages==1.1.6
 django-tastypie==0.9.11
 feedparser==5.1.2
 freebase==1.0.8
-gitenberg.metadata==0.1.6
+#gitenberg.metadata==0.1.6
+git+ssh://git@github.com/gitenberg-dev/metadata.git@2c0fdd5a54f6b893cbb4cc0ee0e4ec6fa3ffbb93
 html5lib==1.0b3
 httplib2==0.7.5
 kombu==2.4.5