Update copyright year, add in-file GPL notices, some clearing up.

This commit is contained in:
Elliott Pardee 2019-02-13 15:42:38 -05:00
parent 358c9bc2d6
commit f3e3e6e145
10 changed files with 205 additions and 178 deletions

4
.idea/encodings.xml generated Normal file
View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

2
.idea/goarch_api.iml generated
View File

@ -5,7 +5,7 @@
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/venv" /> <excludeFolder url="file://$MODULE_DIR$/venv" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="jdk" jdkName="Python 3.7 (goarch_api)" jdkType="Python SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
</component> </component>
<component name="TestRunnerService"> <component name="TestRunnerService">

2
.idea/misc.xml generated
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (goarch_api)" project-jdk-type="Python SDK" /> <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (goarch_api)" project-jdk-type="Python SDK" />
</project> </project>

245
.idea/workspace.xml generated
View File

@ -2,9 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<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 afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/goarch_api.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/goarch_api.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.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/daily.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/daily.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/goarch_api/daily.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/daily.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/goarch_api/lectionary.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/lectionary.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/goarch_api/lectionary.py" beforeDir="false" afterPath="$PROJECT_DIR$/goarch_api/lectionary.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>
@ -14,52 +19,6 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="FUSProjectUsageTrigger">
<session id="1829562699">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="3" />
<entry key="project.open.time.2" value="2" />
<entry key="project.open.time.4" value="2" />
<entry key="project.open.time.8" value="1" />
<entry key="project.opened" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="MANIFEST" value="1" />
<entry key="gitignore" value="2" />
<entry key="md" value="1" />
<entry key="py" value="14" />
<entry key="txt" value="3" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="Markdown" value="1" />
<entry key="PLAIN_TEXT" value="6" />
<entry key="Python" value="14" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="Python Console" value="62" />
<entry key="dummy" value="14" />
<entry key="gitignore" value="1" />
<entry key="md" value="690" />
<entry key="py" value="11943" />
<entry key="txt" value="122" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="Markdown" value="690" />
<entry key="PLAIN_TEXT" value="137" />
<entry key="Python" value="12005" />
</counts>
</usages-collector>
</session>
</component>
<component name="FavoritesManager"> <component name="FavoritesManager">
<favorites_list name="goarch_api" /> <favorites_list name="goarch_api" />
</component> </component>
@ -69,8 +28,8 @@
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="161"> <first_editor relative-caret-position="92">
<caret line="7" selection-start-line="7" selection-end-line="7" /> <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
</first_editor> </first_editor>
<second_editor /> <second_editor />
</state> </state>
@ -80,8 +39,8 @@
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<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="161">
<caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" /> <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -96,15 +55,19 @@
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/MANIFEST"> <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="414">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/LICENSE.txt"> <entry file="file://$PROJECT_DIR$/LICENSE.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15502"> <state relative-caret-position="207">
<caret line="674" selection-start-line="674" selection-end-line="674" /> <caret line="9" column="64" selection-start-line="9" selection-start-column="64" selection-end-line="9" selection-end-column="64" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -112,27 +75,8 @@
<file pinned="false" current-in-tab="false"> <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="575">
<caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" /> <caret line="26" column="71" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
<folding>
<element signature="e#0#15#0" expanded="true" />
<marker date="1535104046164" expanded="true" signature="46:47" ph="..." />
<marker date="1535104046164" expanded="true" signature="46:51" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/goarch_api/daily.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<marker date="1535104025467" expanded="true" signature="165:170" ph="..." />
<marker date="1535104025467" expanded="true" signature="200:438" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -140,8 +84,8 @@
<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="335"> <state relative-caret-position="828">
<caret line="48" column="34" lean-forward="true" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" /> <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
</state> </state>
</provider> </provider>
</entry> </entry>
@ -149,11 +93,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<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="-561"> <state relative-caret-position="874">
<caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" /> <caret line="44" column="23" selection-start-line="44" selection-start-column="23" selection-end-line="44" selection-end-column="23" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -161,12 +102,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py"> <entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197"> <state relative-caret-position="414">
<caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" /> <caret line="18" selection-start-line="18" selection-end-line="18" />
<folding>
<element signature="e#0#9#0" expanded="true" />
<marker date="1535104035875" expanded="true" signature="246:249" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -209,27 +146,29 @@
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<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/daily.py" />
<option value="$PROJECT_DIR$/goarch_api/models.py" /> <option value="$PROJECT_DIR$/goarch_api/models.py" />
<option value="$PROJECT_DIR$/goarch_api/saint.py" /> <option value="$PROJECT_DIR$/goarch_api/daily.py" />
<option value="$PROJECT_DIR$/goarch_api/lectionary.py" /> <option value="$PROJECT_DIR$/goarch_api/lectionary.py" />
<option value="$PROJECT_DIR$/goarch_api/client.py" />
<option value="$PROJECT_DIR$/setup.py" /> <option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/goarch_api/client.py" />
<option value="$PROJECT_DIR$/goarch_api/saint.py" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" extendedState="6"> <component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="11" /> <option name="x" value="840" />
<option name="y" value="47" /> <option name="width" value="840" />
<option name="width" value="1346" /> <option name="height" value="1020" />
<option name="height" value="701" /> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<ConfirmationsSetting value="2" id="Add" />
</component> </component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView"> <component name="ProjectView">
<navigator proportions="" version="1"> <navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@ -242,17 +181,16 @@
<item name="goarch_api" type="462c0819:PsiDirectoryNode" /> <item name="goarch_api" type="462c0819:PsiDirectoryNode" />
<item name="goarch_api" type="462c0819:PsiDirectoryNode" /> <item name="goarch_api" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="goarch_api" type="b2602c69:ProjectViewProjectNode" />
<item name="External Libraries" type="cb654da1:ExternalLibrariesNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent">
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS"> <key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$" /> <recent name="$PROJECT_DIR$" />
@ -395,10 +333,9 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="54" y="27" width="1312" height="741" extended-state="6" /> <frame x="-8" y="-8" width="1696" height="1036" extended-state="6" />
<editor active="true" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.8172839" visible="true" weight="0.24980605" /> <window_info content_ui="combo" id="Project" order="0" sideWeight="0.8172839" visible="true" weight="0.24969843" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" sideWeight="0.18271606" side_tool="true" weight="0.24980605" /> <window_info id="Favorites" order="2" sideWeight="0.18271606" side_tool="true" weight="0.24980605" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -410,7 +347,7 @@
<window_info anchor="bottom" id="TODO" order="6" weight="0.3294702" /> <window_info anchor="bottom" id="TODO" order="6" weight="0.3294702" />
<window_info anchor="bottom" id="Thumbnails" order="7" weight="0.3294702" /> <window_info anchor="bottom" id="Thumbnails" order="7" weight="0.3294702" />
<window_info anchor="bottom" id="Version Control" order="8" /> <window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3305648" /> <window_info active="true" anchor="bottom" id="Terminal" order="9" visible="true" weight="0.322691" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="11" weight="0.3294702" /> <window_info anchor="bottom" id="Python Console" order="11" weight="0.3294702" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -418,22 +355,18 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout> </layout>
</component> </component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/venv/lib/python3.6/site-packages/aiohttp/client.py" /> <entry file="file://$PROJECT_DIR$/venv/lib/python3.6/site-packages/aiohttp/client.py" />
<entry file="file://$PROJECT_DIR$/venv/lib/python3.6/site-packages/lxml/__init__.py"> <entry file="file://$PROJECT_DIR$/venv/lib/python3.6/site-packages/lxml/__init__.py" />
<provider selected="true" editor-type-id="text-editor" />
</entry>
<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$/MANIFEST" />
<entry file="file://$PROJECT_DIR$/README.md"> <entry file="file://$PROJECT_DIR$/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]"> <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT"> <state split_layout="SPLIT">
<first_editor relative-caret-position="161"> <first_editor relative-caret-position="92">
<caret line="7" selection-start-line="7" selection-end-line="7" /> <caret line="4" column="22" selection-start-line="4" selection-start-column="22" selection-end-line="4" selection-end-column="22" />
</first_editor> </first_editor>
<second_editor /> <second_editor />
</state> </state>
@ -446,72 +379,52 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/MANIFEST"> <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="414">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/LICENSE.txt"> <entry file="file://$PROJECT_DIR$/LICENSE.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15502"> <state relative-caret-position="207">
<caret line="674" selection-start-line="674" selection-end-line="674" /> <caret line="9" column="64" selection-start-line="9" selection-start-column="64" selection-end-line="9" selection-end-column="64" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/daily.py">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<element signature="e#0#22#0" expanded="true" />
<marker date="1535104025467" expanded="true" signature="165:170" ph="..." />
<marker date="1535104025467" expanded="true" signature="200:438" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="48" column="34" lean-forward="true" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-561">
<caret line="55" lean-forward="true" selection-start-line="55" selection-end-line="55" />
<folding>
<element signature="e#0#9#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="197">
<caret line="73" lean-forward="true" selection-start-line="73" selection-end-line="73" />
<folding>
<element signature="e#0#9#0" expanded="true" />
<marker date="1535104035875" expanded="true" signature="246:249" ph="..." />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<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="575">
<caret line="8" column="79" selection-start-line="8" selection-start-column="79" selection-end-line="8" selection-end-column="79" /> <caret line="26" column="71" selection-start-line="26" selection-start-column="71" selection-end-line="26" selection-end-column="71" />
<folding> </state>
<element signature="e#0#15#0" expanded="true" /> </provider>
<marker date="1535104046164" expanded="true" signature="46:47" ph="..." /> </entry>
<marker date="1535104046164" expanded="true" signature="46:51" ph="..." /> <entry file="file://$PROJECT_DIR$/goarch_api/models.py">
</folding> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828">
<caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/saint.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="874">
<caret line="44" column="23" selection-start-line="44" selection-start-column="23" selection-end-line="44" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/goarch_api/lectionary.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state> </state>
</provider> </provider>
</entry> </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="161">
<caret line="4" column="18" selection-start-line="4" selection-start-column="18" selection-end-line="4" selection-end-column="18" /> <caret line="7" column="32" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
</state> </state>
</provider> </provider>
</entry> </entry>

View File

@ -1,3 +1,21 @@
"""
Copyright (c) 2018-2019 Elliott Pardee <me [at] vypr [dot] xyz>
This file is part of goarch_api.
goarch_api is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
goarch_api is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with goarch_api. If not, see <http://www.gnu.org/licenses/>.
"""
import requests import requests
import sys import sys
@ -6,8 +24,8 @@ 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.8), Python/' base_ua = 'goarch_api (https://github.com/vypr/goarch_api 1.0.9), Python/'
self.user_agent = f"{user_agent}{sys.version_info[0]}.{sys.version_info[1]}" self.user_agent = f"{base_ua}{sys.version_info[0]}.{sys.version_info[1]}"
def request(self, method, path): def request(self, method, path):
base_url = "https://onlinechapel.goarch.org" base_url = "https://onlinechapel.goarch.org"

View File

@ -1,3 +1,21 @@
"""
Copyright (c) 2018-2019 Elliott Pardee <me [at] vypr [dot] xyz>
This file is part of goarch_api.
goarch_api is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
goarch_api is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with goarch_api. If not, see <http://www.gnu.org/licenses/>.
"""
from lxml import etree from lxml import etree
from goarch_api.client import HTTPClient from goarch_api.client import HTTPClient
@ -15,6 +33,14 @@ class Daily:
self._path += f"?date={date}" self._path += f"?date={date}"
self.public_url += f"?date={date}" self.public_url += f"?date={date}"
self.formatted_date = None
self.icon = None
self.fasting = None
self.tone = None
self.readings = []
self.lectionary_title = None
self.saints = []
def get_data(self): def get_data(self):
client = HTTPClient() client = HTTPClient()
@ -30,8 +56,6 @@ class Daily:
self.fasting = tree.find("fasting").text self.fasting = tree.find("fasting").text
self.tone = tree.find("tone").text self.tone = tree.find("tone").text
self.readings = []
for reading in tree.find("readings").iterchildren(): for reading in tree.find("readings").iterchildren():
_id = reading.get("id") _id = reading.get("id")
_type = reading.find("type").text _type = reading.find("type").text

View File

@ -1,3 +1,21 @@
"""
Copyright (c) 2018-2019 Elliott Pardee <me [at] vypr [dot] xyz>
This file is part of goarch_api.
goarch_api is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
goarch_api is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with goarch_api. If not, see <http://www.gnu.org/licenses/>.
"""
import re import re
import html import html
@ -27,6 +45,11 @@ class Lectionary:
self._path += f"&date={date}" self._path += f"&date={date}"
self.public_url += f"&date={date}" self.public_url += f"&date={date}"
self.display_title = None
self.prokeimenon = None
self.icon = None
self.translations = []
def get_data(self): def get_data(self):
client = HTTPClient() client = HTTPClient()

View File

@ -1,3 +1,22 @@
"""
Copyright (c) 2018-2019 Elliott Pardee <me [at] vypr [dot] xyz>
This file is part of goarch_api.
goarch_api is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
goarch_api is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with goarch_api. If not, see <http://www.gnu.org/licenses/>.
"""
class Reading: class Reading:
def __init__(self, _id, _type, type_bb, event, translation=None, date=None): def __init__(self, _id, _type, type_bb, event, translation=None, date=None):
self.id = _id self.id = _id
@ -39,11 +58,11 @@ class Translation:
class Icon: class Icon:
def __init__(self, file_path, copyright, _id=None): def __init__(self, file_path, _copyright, _id=None):
self.id = _id self.id = _id
self.file_path = file_path self.file_path = file_path
self.url = f"https://onlinechapel.goarch.org/images/{file_path}" self.url = f"https://onlinechapel.goarch.org/images/{file_path}"
self.copyright = copyright self.copyright = _copyright
# this is like a Reading/Translation hybrid # this is like a Reading/Translation hybrid

View File

@ -1,3 +1,21 @@
"""
Copyright (c) 2018-2019 Elliott Pardee <me [at] vypr [dot] xyz>
This file is part of goarch_api.
goarch_api is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
goarch_api is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with goarch_api. If not, see <http://www.gnu.org/licenses/>.
"""
import re import re
from lxml import etree from lxml import etree
@ -18,6 +36,14 @@ class Saint:
self._path = f"/saints.asp?contentid={_id}" self._path = f"/saints.asp?contentid={_id}"
self.public_url = f"https://www.goarch.org/chapel/saints?contentid={_id}" self.public_url = f"https://www.goarch.org/chapel/saints?contentid={_id}"
self.title = None
self.display_date = None
self.date = None
self.icons = []
self.lectionary = []
self.readings = []
self.hymns = []
def get_data(self): def get_data(self):
client = HTTPClient() client = HTTPClient()

View File

@ -2,10 +2,10 @@ from setuptools import setup
setup( setup(
name="goarch_api", name="goarch_api",
version="1.0.8", version="1.0.9",
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/vypr/goarch_api",
license="GPLv3", license="GPLv3",
packages=["goarch_api"], packages=["goarch_api"],
description="A Python interface for the Greek Orthodox Archdiocese of America's Chapel API.", description="A Python interface for the Greek Orthodox Archdiocese of America's Chapel API.",