From 293da5f2fe7301333f44296f1b579117d1b24e86 Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 19 Mar 2018 12:01:54 -0400 Subject: [PATCH 1/5] DRY reading yaml don't have classes reading yaml in different ways. --- gitensite/apps/bookinfo/db.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gitensite/apps/bookinfo/db.py b/gitensite/apps/bookinfo/db.py index d927fa4..1a60180 100644 --- a/gitensite/apps/bookinfo/db.py +++ b/gitensite/apps/bookinfo/db.py @@ -1,13 +1,16 @@ +from gitenberg.metadata.pandata import Pandata + from gitensite.apps.bookinfo.models import Author, Book, Cover -import yaml as PyYAML def default_ctor(loader, tag_suffix, node): return tag_suffix + ' ' + node.value -PyYAML.add_multi_constructor('!lcc', default_ctor) -PyYAML.add_multi_constructor('!lcsh', default_ctor) def addBookFromYaml(yaml): - obj = PyYAML.safe_load(yaml) + if isinstance(yaml, Pandata) + obj = yaml.metadata + else: + pandata = Pandata().load(yaml) + obj = pandata.metadata (book,created) = Book.objects.get_or_create(book_id=int(obj['identifiers']['gutenberg'])) From 9daf20b461d0de1e94dd98a608f46e5dea65b55a Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 19 Mar 2018 12:27:49 -0400 Subject: [PATCH 2/5] stupid mistake --- gitensite/apps/bookinfo/db.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitensite/apps/bookinfo/db.py b/gitensite/apps/bookinfo/db.py index 1a60180..fc0723b 100644 --- a/gitensite/apps/bookinfo/db.py +++ b/gitensite/apps/bookinfo/db.py @@ -6,7 +6,7 @@ def default_ctor(loader, tag_suffix, node): return tag_suffix + ' ' + node.value def addBookFromYaml(yaml): - if isinstance(yaml, Pandata) + if isinstance(yaml, Pandata): obj = yaml.metadata else: pandata = Pandata().load(yaml) From 13cb18ac8fa8e475e6fd3215cf48a9921aacbb87 Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 19 Mar 2018 12:58:10 -0400 Subject: [PATCH 3/5] pass tests --- gitensite/apps/bookinfo/db.py | 3 ++- gitensite/settings.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gitensite/apps/bookinfo/db.py b/gitensite/apps/bookinfo/db.py index fc0723b..9977cf2 100644 --- a/gitensite/apps/bookinfo/db.py +++ b/gitensite/apps/bookinfo/db.py @@ -9,7 +9,8 @@ def addBookFromYaml(yaml): if isinstance(yaml, Pandata): obj = yaml.metadata else: - pandata = Pandata().load(yaml) + pandata = Pandata(None) + pandata.load(yaml) obj = pandata.metadata (book,created) = Book.objects.get_or_create(book_id=int(obj['identifiers']['gutenberg'])) diff --git a/gitensite/settings.py b/gitensite/settings.py index 604f4b9..3c930e9 100644 --- a/gitensite/settings.py +++ b/gitensite/settings.py @@ -88,7 +88,7 @@ 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'gitensite', - 'USER': 'postgres', + 'USER': 'eric', 'PASSWORD': 'gitensite', 'HOST': 'localhost', 'PORT': '5432', From e13b51c2e855b04c24d3ab3e35c9586d91a8ae9e Mon Sep 17 00:00:00 2001 From: eric Date: Mon, 19 Mar 2018 13:09:27 -0400 Subject: [PATCH 4/5] whoops --- gitensite/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitensite/settings.py b/gitensite/settings.py index 3c930e9..604f4b9 100644 --- a/gitensite/settings.py +++ b/gitensite/settings.py @@ -88,7 +88,7 @@ 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', 'NAME': 'gitensite', - 'USER': 'eric', + 'USER': 'postgres', 'PASSWORD': 'gitensite', 'HOST': 'localhost', 'PORT': '5432', From 95677291ed479d949a9a841648f9371f4d199ae1 Mon Sep 17 00:00:00 2001 From: Brandon Rothweiler Date: Sun, 25 Mar 2018 13:36:20 -0400 Subject: [PATCH 5/5] remove unused code --- gitensite/apps/bookinfo/db.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/gitensite/apps/bookinfo/db.py b/gitensite/apps/bookinfo/db.py index 9977cf2..7358953 100644 --- a/gitensite/apps/bookinfo/db.py +++ b/gitensite/apps/bookinfo/db.py @@ -2,9 +2,6 @@ from gitensite.apps.bookinfo.models import Author, Book, Cover -def default_ctor(loader, tag_suffix, node): - return tag_suffix + ' ' + node.value - def addBookFromYaml(yaml): if isinstance(yaml, Pandata): obj = yaml.metadata