srp/goarch_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Complete the LectionaryReading object.

Browse Source
This commit is contained in:
Elliott Pardee 2018-08-24 05:10:19 -04:00
parent a809176318
commit b23755e1bd
5 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
.idea/workspace.xml generated
View File

@ -4,6 +4,7 @@
<list default="true" id="c8edefbc-71df-41a9-9878-b830c52cd7b5" name="Default Changelist" comment=""> <list default="true" id="c8edefbc-71df-41a9-9878-b830c52cd7b5" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/goarch_api/client.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/client.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/goarch_api/client.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/client.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/goarch_api/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/goarch_api/saint.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/saint.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/goarch_api/saint.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/saint.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/setup.py" beforeDir="false" afterPath="$PROJECT_DIR$/setup.py" afterDir="false" />
</list> </list>
@ -20,7 +21,8 @@
<entry key="project.closed" value="3" /> <entry key="project.closed" value="3" />
<entry key="project.open.time.2" value="2" /> <entry key="project.open.time.2" value="2" />
<entry key="project.open.time.4" value="2" /> <entry key="project.open.time.4" value="2" />
<entry key="project.opened" value="4" /> <entry key="project.open.time.8" value="1" />
<entry key="project.opened" value="5" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.open"> <usages-collector id="statistics.file.extensions.open">
@ -45,7 +47,7 @@
<entry key="dummy" value="14" /> <entry key="dummy" value="14" />
<entry key="gitignore" value="1" /> <entry key="gitignore" value="1" />
<entry key="md" value="690" /> <entry key="md" value="690" />
<entry key="py" value="11483" /> <entry key="py" value="11660" />
<entry key="txt" value="122" /> <entry key="txt" value="122" />
</counts> </counts>
</usages-collector> </usages-collector>
@ -53,7 +55,7 @@
<counts> <counts>
<entry key="Markdown" value="690" /> <entry key="Markdown" value="690" />
<entry key="PLAIN_TEXT" value="137" /> <entry key="PLAIN_TEXT" value="137" />
<entry key="Python" value="11545" /> <entry key="Python" value="11722" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
@ -107,15 +109,15 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/goarch_api/client.py"> <entry file="file://$PROJECT_DIR$/goarch_api/client.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="36">
<caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" /> <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#15#0" expanded="true" />
<marker date="1535100009297" expanded="true" signature="46:47" ph="..." /> <marker date="1535101609012" expanded="true" signature="46:47" ph="..." />
<marker date="1535100009297" expanded="true" signature="46:51" ph="..." /> <marker date="1535101609012" expanded="true" signature="46:51" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -124,7 +126,7 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/goarch_api/daily.py"> <entry file="file://$PROJECT_DIR$/goarch_api/daily.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="174">
<caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" /> <caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" />
<folding> <folding>
<element signature="e#0#22#0" expanded="true" /> <element signature="e#0#22#0" expanded="true" />
@ -138,17 +140,17 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/goarch_api/models.py"> <entry file="file://$PROJECT_DIR$/goarch_api/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23"> <state relative-caret-position="197">
<caret line="41" column="23" lean-forward="true" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" /> <caret line="52" column="25" lean-forward="true" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="25" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/goarch_api/saint.py"> <entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138"> <state relative-caret-position="161">
<caret line="36" column="36" lean-forward="true" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" /> <caret line="52" column="85" selection-start-line="52" selection-start-column="85" selection-end-line="52" selection-end-column="85" />
<folding> <folding>
<element signature="e#0#9#0" expanded="true" /> <element signature="e#0#9#0" expanded="true" />
</folding> </folding>
@ -201,14 +203,14 @@
<option value="$PROJECT_DIR$/src/goarch_api/client.py" /> <option value="$PROJECT_DIR$/src/goarch_api/client.py" />
<option value="$PROJECT_DIR$/src/test_all.py" /> <option value="$PROJECT_DIR$/src/test_all.py" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/goarch_api/models.py" />
<option value="$PROJECT_DIR$/LICENSE.txt" /> <option value="$PROJECT_DIR$/LICENSE.txt" />
<option value="$PROJECT_DIR$/README.md" /> <option value="$PROJECT_DIR$/README.md" />
<option value="$PROJECT_DIR$/goarch_api/lectionary.py" /> <option value="$PROJECT_DIR$/goarch_api/lectionary.py" />
<option value="$PROJECT_DIR$/goarch_api/daily.py" /> <option value="$PROJECT_DIR$/goarch_api/daily.py" />
<option value="$PROJECT_DIR$/goarch_api/saint.py" />
<option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/goarch_api/client.py" /> <option value="$PROJECT_DIR$/goarch_api/client.py" />
<option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/goarch_api/models.py" />
<option value="$PROJECT_DIR$/goarch_api/saint.py" />
</list> </list>
</option> </option>
</component> </component>
@ -400,6 +402,16 @@
<entry file="file://$PROJECT_DIR$/src/goarch_api/translation.py" /> <entry file="file://$PROJECT_DIR$/src/goarch_api/translation.py" />
<entry file="file://$PROJECT_DIR$/src/goarch_api/reading.py" /> <entry file="file://$PROJECT_DIR$/src/goarch_api/reading.py" />
<entry file="file://$PROJECT_DIR$/src/test_all.py" /> <entry file="file://$PROJECT_DIR$/src/test_all.py" />
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="161">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3082"> <state relative-caret-position="3082">
@ -428,16 +440,21 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/goarch_api/models.py"> <entry file="file://$PROJECT_DIR$/goarch_api/client.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="23"> <state relative-caret-position="36">
<caret line="41" column="23" lean-forward="true" selection-start-line="41" selection-start-column="23" selection-end-line="41" selection-end-column="23" /> <caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1535101609012" expanded="true" signature="46:47" ph="..." />
<marker date="1535101609012" expanded="true" signature="46:51" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/goarch_api/daily.py"> <entry file="file://$PROJECT_DIR$/goarch_api/daily.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289"> <state relative-caret-position="174">
<caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" /> <caret line="62" column="51" selection-start-line="62" selection-start-column="51" selection-end-line="62" selection-end-column="51" />
<folding> <folding>
<element signature="e#0#22#0" expanded="true" /> <element signature="e#0#22#0" expanded="true" />
@ -447,26 +464,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="138">
<caret line="36" column="36" lean-forward="true" selection-start-line="36" selection-start-column="36" selection-end-line="36" selection-end-column="36" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
<first_editor relative-caret-position="161">
<caret line="7" selection-start-line="7" selection-end-line="7" />
</first_editor>
<second_editor />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/setup.py"> <entry file="file://$PROJECT_DIR$/setup.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="92"> <state relative-caret-position="92">
@ -474,14 +471,19 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/goarch_api/client.py"> <entry file="file://$PROJECT_DIR$/goarch_api/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="197">
<caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" /> <caret line="52" column="25" lean-forward="true" selection-start-line="52" selection-start-column="25" selection-end-line="52" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="161">
<caret line="52" column="85" selection-start-line="52" selection-start-column="85" selection-end-line="52" selection-end-column="85" />
<folding> <folding>
<element signature="e#0#15#0" expanded="true" /> <element signature="e#0#9#0" expanded="true" />
<marker date="1535100009297" expanded="true" signature="46:47" ph="..." />
<marker date="1535100009297" expanded="true" signature="46:51" ph="..." />
</folding> </folding>
</state> </state>
</provider> </provider>

2
goarch_api/client.py
View File

@ -6,7 +6,7 @@ class HTTPClient:
def __init__(self): def __init__(self):
self.session = requests.session() self.session = requests.session()
user_agent = 'goarch_api (https://github.com/Oikonomia/goarch_api 1.0.4), Python/' user_agent = 'goarch_api (https://github.com/Oikonomia/goarch_api 1.0.5), Python/'
self.user_agent = f"{user_agent}{sys.version_info[0]}.{sys.version_info[1]}" self.user_agent = f"{user_agent}{sys.version_info[0]}.{sys.version_info[1]}"
def request(self, method, path): def request(self, method, path):

4
goarch_api/models.py
View File

@ -48,9 +48,11 @@ class Icon:
# this is like a Reading/Translation hybrid # this is like a Reading/Translation hybrid
class LectionaryReading: class LectionaryReading:
def __init__(self, _id, _type): def __init__(self, _id, _type, title, short_title):
self.id = _id self.id = _id
self.type = _type self.type = _type
self.title = title
self.short_title = short_title
class Hymn: class Hymn:

4
goarch_api/saint.py
View File

@ -47,8 +47,10 @@ class Saint:
for reading in tree.find("lectionary").iterchildren(): for reading in tree.find("lectionary").iterchildren():
_id = reading.find("id").text _id = reading.find("id").text
_type = reading.get("type") _type = reading.get("type")
title = reading.find("title").text
short_title = reading.find("shorttitle").text
lectionary_reading = LectionaryReading(_id, _type) lectionary_reading = LectionaryReading(_id, _type, title, short_title)
self.lectionary.append(lectionary_reading) self.lectionary.append(lectionary_reading)

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name="goarch_api", name="goarch_api",
version="1.0.4", version="1.0.5",
author="Elliott Pardee", author="Elliott Pardee",
author_email="me@vypr.xyz", author_email="me@vypr.xyz",
url="https://github.com/Oikonomia/goarch_api", url="https://github.com/Oikonomia/goarch_api",