sam/mopidy-radionet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix get_api_key on startup

Browse Source
This commit is contained in:
blackberrymamba
2018-01-05 23:23:54 +01:00
parent 86b6fa5743
commit 44729a4bca
3 changed files with 86 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

187
.idea/workspace.xml generated
View File

@@ -4,7 +4,7 @@
<list default="true" id="a827305c-f450-4dd8-9234-28c4c187e3c8" name="Default" comment=""> <list default="true" id="a827305c-f450-4dd8-9234-28c4c187e3c8" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/mopidy_radionet/__init__.py" afterPath="$PROJECT_DIR$/mopidy_radionet/__init__.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/mopidy_radionet/__init__.py" afterPath="$PROJECT_DIR$/mopidy_radionet/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup.cfg" afterPath="$PROJECT_DIR$/setup.cfg" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/mopidy_radionet/radionet.py" afterPath="$PROJECT_DIR$/mopidy_radionet/radionet.py" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@@ -21,8 +21,8 @@
<file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mopidy_radionet/__init__.py"> <entry file="file://$PROJECT_DIR$/mopidy_radionet/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="330">
<caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" /> <caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
@@ -30,11 +30,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="radionet.py" pinned="false" current-in-tab="false"> <file leaf-file-name="radionet.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/mopidy_radionet/radionet.py"> <entry file="file://$PROJECT_DIR$/mopidy_radionet/radionet.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="340">
<caret line="77" column="45" lean-forward="false" selection-start-line="77" selection-start-column="45" selection-end-line="77" selection-end-column="45" /> <caret line="96" column="67" lean-forward="true" selection-start-line="96" selection-start-column="67" selection-end-line="96" selection-end-column="67" />
<folding> <folding>
<element signature="e#47#86#0" expanded="true" /> <element signature="e#47#86#0" expanded="true" />
</folding> </folding>
@@ -42,21 +42,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="README.rst" pinned="false" current-in-tab="false"> <file leaf-file-name="backend.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/README.rst"> <entry file="file://$PROJECT_DIR$/mopidy_radionet/backend.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287"> <state relative-caret-position="315">
<caret line="45" column="17" lean-forward="false" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" /> <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="setup.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/setup.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="61" lean-forward="true" selection-start-line="16" selection-start-column="61" selection-end-line="16" selection-end-column="61" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
@@ -64,26 +54,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="setup.cfg" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/setup.cfg">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="requires.txt" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/requires.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
@@ -105,6 +75,8 @@
<find>blakb</find> <find>blakb</find>
<find>blak</find> <find>blak</find>
<find>downl</find> <find>downl</find>
<find>get_api</find>
<find>`</find>
</findStrings> </findStrings>
</component> </component>
<component name="Git.Settings"> <component name="Git.Settings">
@@ -124,10 +96,10 @@
<option value="$PROJECT_DIR$/tests/test_extension.py" /> <option value="$PROJECT_DIR$/tests/test_extension.py" />
<option value="$PROJECT_DIR$/mopidy_radionet/library.py" /> <option value="$PROJECT_DIR$/mopidy_radionet/library.py" />
<option value="$PROJECT_DIR$/mopidy_radionet/backend.py" /> <option value="$PROJECT_DIR$/mopidy_radionet/backend.py" />
<option value="$PROJECT_DIR$/mopidy_radionet/radionet.py" />
<option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/setup.cfg" /> <option value="$PROJECT_DIR$/setup.cfg" />
<option value="$PROJECT_DIR$/setup.py" />
<option value="$PROJECT_DIR$/mopidy_radionet/__init__.py" /> <option value="$PROJECT_DIR$/mopidy_radionet/__init__.py" />
<option value="$PROJECT_DIR$/mopidy_radionet/radionet.py" />
</list> </list>
</option> </option>
</component> </component>
@@ -153,7 +125,6 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<expand> <expand>
@@ -166,11 +137,6 @@
<item name="mopidy-radionet" type="462c0819:PsiDirectoryNode" /> <item name="mopidy-radionet" type="462c0819:PsiDirectoryNode" />
<item name="mopidy_radionet" type="462c0819:PsiDirectoryNode" /> <item name="mopidy_radionet" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="mopidy-radionet" type="b2602c69:ProjectViewProjectNode" />
<item name="mopidy-radionet" type="462c0819:PsiDirectoryNode" />
<item name="Mopidy_RadioNet.egg-info" type="462c0819:PsiDirectoryNode" />
</path>
<path> <path>
<item name="mopidy-radionet" type="b2602c69:ProjectViewProjectNode" /> <item name="mopidy-radionet" type="b2602c69:ProjectViewProjectNode" />
<item name="mopidy-radionet" type="462c0819:PsiDirectoryNode" /> <item name="mopidy-radionet" type="462c0819:PsiDirectoryNode" />
@@ -180,6 +146,7 @@
<select /> <select />
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@@ -293,11 +260,12 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="169" y="133" width="1366" height="739" extended-state="6" /> <frame x="0" y="29" width="1366" height="739" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24963397" sideWeight="0.4944" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2510981" sideWeight="0.4944" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4672" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" x="0" y="367" width="1366" height="292" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4672" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" x="0" y="367" width="1366" height="292" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -308,23 +276,11 @@
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.5056" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.5056" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4672" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" x="0" y="367" width="1366" height="292" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24963397" sideWeight="0.4944" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.4944" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3987034" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24963397" sideWeight="0.5056" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -377,9 +333,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30"> <state relative-caret-position="30">
<caret line="2" column="9" lean-forward="true" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" /> <caret line="2" column="9" lean-forward="true" selection-start-line="2" selection-start-column="9" selection-end-line="2" selection-end-column="9" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -398,7 +351,7 @@
<state relative-caret-position="180"> <state relative-caret-position="180">
<caret line="20" column="32" lean-forward="false" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" /> <caret line="20" column="32" lean-forward="false" selection-start-line="20" selection-start-column="32" selection-end-line="20" selection-end-column="32" />
<folding> <folding>
<element signature="e#0#39#0" expanded="false" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -407,7 +360,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="135">
<caret line="9" column="16" lean-forward="true" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" /> <caret line="9" column="16" lean-forward="true" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -415,9 +367,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660"> <state relative-caret-position="660">
<caret line="48" column="19" lean-forward="false" selection-start-line="48" selection-start-column="19" selection-end-line="48" selection-end-column="19" /> <caret line="48" column="19" lean-forward="false" selection-start-line="48" selection-start-column="19" selection-end-line="48" selection-end-column="19" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -426,7 +375,7 @@
<state relative-caret-position="525"> <state relative-caret-position="525">
<caret line="41" column="41" lean-forward="false" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" /> <caret line="41" column="41" lean-forward="false" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
<folding> <folding>
<element signature="e#0#39#0" expanded="false" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -445,7 +394,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
<caret line="6" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> <caret line="6" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -453,9 +401,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210"> <state relative-caret-position="210">
<caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" /> <caret line="15" column="0" lean-forward="false" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -488,9 +433,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="645"> <state relative-caret-position="645">
<caret line="47" column="19" lean-forward="false" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="19" /> <caret line="47" column="19" lean-forward="false" selection-start-line="47" selection-start-column="19" selection-end-line="47" selection-end-column="19" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -499,7 +441,7 @@
<state relative-caret-position="525"> <state relative-caret-position="525">
<caret line="41" column="41" lean-forward="true" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" /> <caret line="41" column="41" lean-forward="true" selection-start-line="41" selection-start-column="41" selection-end-line="41" selection-end-column="41" />
<folding> <folding>
<element signature="e#0#39#0" expanded="false" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@@ -508,7 +450,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75"> <state relative-caret-position="75">
<caret line="5" column="16" lean-forward="true" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" /> <caret line="5" column="16" lean-forward="true" selection-start-line="5" selection-start-column="16" selection-end-line="5" selection-end-column="16" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -526,9 +467,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="1" column="37" lean-forward="true" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" /> <caret line="1" column="37" lean-forward="true" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -560,9 +498,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -663,23 +598,14 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/dependency_links.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="15">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/dependency_links.txt" />
<entry file="file://$PROJECT_DIR$/tox.ini"> <entry file="file://$PROJECT_DIR$/tox.ini">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135"> <state relative-caret-position="135">
<caret line="9" column="10" lean-forward="false" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" /> <caret line="9" column="10" lean-forward="false" selection-start-line="9" selection-start-column="10" selection-end-line="9" selection-end-column="10" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -687,9 +613,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527"> <state relative-caret-position="527">
<caret line="54" column="4" lean-forward="false" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" /> <caret line="54" column="4" lean-forward="false" selection-start-line="54" selection-start-column="4" selection-end-line="54" selection-end-column="4" />
<folding>
<element signature="e#0#15#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -697,9 +620,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60"> <state relative-caret-position="60">
<caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" /> <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding>
<element signature="e#0#39#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@@ -707,46 +627,31 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="195">
<caret line="32" column="16" lean-forward="false" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" /> <caret line="32" column="16" lean-forward="false" selection-start-line="32" selection-start-column="16" selection-end-line="32" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/PKG-INFO" />
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/requires.txt" />
<entry file="file://$PROJECT_DIR$/mopidy_radionet/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="330">
<caret line="22" column="18" lean-forward="false" selection-start-line="22" selection-start-column="18" selection-end-line="22" selection-end-column="18" />
<folding> <folding>
<element signature="e#0#39#0" expanded="false" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/mopidy_radionet/backend.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="120"> <state relative-caret-position="452">
<caret line="8" column="0" lean-forward="false" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> <caret line="33" column="10" lean-forward="true" selection-start-line="33" selection-start-column="10" selection-end-line="33" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/PKG-INFO">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mopidy_radionet/radionet.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="77" column="45" lean-forward="false" selection-start-line="77" selection-start-column="45" selection-end-line="77" selection-end-column="45" />
<folding> <folding>
<element signature="e#47#86#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/README.rst">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="287">
<caret line="45" column="17" lean-forward="false" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/setup.cfg"> <entry file="file://$PROJECT_DIR$/setup.cfg">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="45">
@@ -755,30 +660,30 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Mopidy_RadioNet.egg-info/requires.txt"> <entry file="file://$PROJECT_DIR$/README.rst">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45"> <state relative-caret-position="675">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="45" column="17" lean-forward="false" selection-start-line="45" selection-start-column="17" selection-end-line="45" selection-end-column="17" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/mopidy_radionet/__init__.py"> <entry file="file://$PROJECT_DIR$/mopidy_radionet/backend.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="315">
<caret line="8" column="20" lean-forward="false" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" /> <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/setup.py"> <entry file="file://$PROJECT_DIR$/mopidy_radionet/radionet.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240"> <state relative-caret-position="340">
<caret line="16" column="61" lean-forward="true" selection-start-line="16" selection-start-column="61" selection-end-line="16" selection-end-column="61" /> <caret line="96" column="67" lean-forward="true" selection-start-line="96" selection-start-column="67" selection-end-line="96" selection-end-column="67" />
<folding> <folding>
<element signature="e#0#39#0" expanded="true" /> <element signature="e#47#86#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

2
mopidy_radionet/__init__.py
View File

@@ -6,7 +6,7 @@ import os
from mopidy import config, ext from mopidy import config, ext
__version__ = '0.1.2' __version__ = '0.1.3'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

69
mopidy_radionet/radionet.py
View File

@@ -58,8 +58,6 @@ class RadioNetClient(object):
self.session.headers.update({'user-agent': full_user_agent}) self.session.headers.update({'user-agent': full_user_agent})
self.session.headers.update({'cache-control': 'no-cache'}) self.session.headers.update({'cache-control': 'no-cache'})
self.get_api_key()
def set_lang(self, lang): def set_lang(self, lang):
langs = ['net', 'de', 'at', 'fr', 'pt', 'es', 'dk', 'se', 'it', 'pl'] langs = ['net', 'de', 'at', 'fr', 'pt', 'es', 'dk', 'se', 'it', 'pl']
if lang in langs: if lang in langs:
@@ -78,9 +76,27 @@ class RadioNetClient(object):
return int(round(time.time() * 1000)) return int(round(time.time() * 1000))
def get_api_key(self): def get_api_key(self):
tmp_str = self.session.get(self.base_url) if self.api_key is not None:
m = re.search('apiKey ?= ?[\'|"](.*)[\'|"];', tmp_str.content) return
self.api_key = m.group(1).encode()
try:
tmp_str = self.session.get(self.base_url)
m = re.search('apiKey ?= ?[\'|"](.*)[\'|"];', tmp_str.content)
self.api_key = m.group(1).encode()
logger.info('Radio.net: APIKEY %s' % self.api_key)
except Exception:
logger.error('Radio.net: Failed to connect %s retrying'
' on next browse.' % self.base_url)
def do_post(self, api_sufix, url_params=None, payload=None):
self.get_api_key()
if 'apikey' in url_params.keys():
url_params['apikey'] = self.api_key
response = self.session.post(self.api_base_url + api_sufix,
params=url_params, data=payload)
return response
def check_auth(self): def check_auth(self):
url_params = { url_params = {
@@ -89,18 +105,15 @@ class RadioNetClient(object):
} }
logger.debug('Radio.net: Check auth.') logger.debug('Radio.net: Check auth.')
api_sufix = 'user/account' api_sufix = 'user/account'
response = self.session.post(self.api_base_url + api_sufix,
params=url_params)
if response.status_code is not 200: response = self.do_post(api_sufix, url_params)
logger.error('Radio.net: Auth error.')
json = response.json()
self.user_login = json['login']
if len(self.user_login) == 0:
self.auth = False
else: else:
json = response.json() self.auth = True
self.user_login = json['login']
if len(self.user_login) == 0:
self.auth = False
else:
self.auth = True
def login(self, username, password): def login(self, username, password):
self.check_auth() self.check_auth()
@@ -122,8 +135,7 @@ class RadioNetClient(object):
'login': username, 'login': username,
'password': password, 'password': password,
} }
response = self.session.post(self.api_base_url + api_sufix, response = self.do_post(api_sufix, url_params, payload)
params=url_params, data=payload)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Login error. ' + response.text) logger.error('Radio.net: Login error. ' + response.text)
@@ -140,8 +152,7 @@ class RadioNetClient(object):
'_': self.current_milli_time(), '_': self.current_milli_time(),
} }
api_sufix = 'user/logout' api_sufix = 'user/logout'
response = self.session.post(self.api_base_url + api_sufix, response = self.do_post(api_sufix, url_params)
params=url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Error logout.') logger.error('Radio.net: Error logout.')
@@ -152,7 +163,7 @@ class RadioNetClient(object):
else: else:
logger.info('Radio.net: Logout successful.') logger.info('Radio.net: Logout successful.')
self.session.cookies.clear_session_cookies() self.session.close()
def get_bookmarks(self): def get_bookmarks(self):
self.station_bookmarks = None self.station_bookmarks = None
@@ -164,8 +175,7 @@ class RadioNetClient(object):
} }
api_sufix = 'user/bookmarks' api_sufix = 'user/bookmarks'
response = self.session.post(self.api_base_url + api_sufix, response = self.do_post(api_sufix, url_params)
params=url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: ' + response.text) logger.error('Radio.net: ' + response.text)
@@ -207,8 +217,9 @@ class RadioNetClient(object):
'_': self.current_milli_time(), '_': self.current_milli_time(),
'station': station_id, 'station': station_id,
} }
response = self.session.post(self.api_base_url + api_sufix,
params=url_params) response = self.do_post(api_sufix, url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Error on get station by id ' + logger.error('Radio.net: Error on get station by id ' +
str(station_id) + ". Error: " + response.text) str(station_id) + ". Error: " + response.text)
@@ -245,8 +256,7 @@ class RadioNetClient(object):
'sizeperpage': 100, 'sizeperpage': 100,
} }
response = self.session.post(self.api_base_url + api_sufix, response = self.do_post(api_sufix, url_params)
params=url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Get local stations error. ' + logger.error('Radio.net: Get local stations error. ' +
@@ -274,8 +284,7 @@ class RadioNetClient(object):
'sizeperpage': 100, 'sizeperpage': 100,
} }
response = self.session.post(self.api_base_url + api_sufix, response = self.do_post(api_sufix, url_params)
params=url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Get top stations error. ' + response.text) logger.error('Radio.net: Get top stations error. ' + response.text)
@@ -302,8 +311,8 @@ class RadioNetClient(object):
'query': query_string, 'query': query_string,
'pageindex': page_index, 'pageindex': page_index,
} }
response = self.session.post(self.api_base_url + api_sufix,
params=url_params) response = self.do_post(api_sufix, url_params)
if response.status_code is not 200: if response.status_code is not 200:
logger.error('Radio.net: Search error ' + response.text) logger.error('Radio.net: Search error ' + response.text)