diff --git a/.idea/workspace.xml b/.idea/workspace.xml index cf55ca4cb2e5692ba46e315ee5f6c342fdf12fbb..72a3885443e721d975463809272d43167a536a1d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ChangeListManager"> - <list default="true" id="aff2bad9-38b8-42d4-aeb2-aaf379065bd8" name="Default" comment="" /> + <list default="true" id="aff2bad9-38b8-42d4-aeb2-aaf379065bd8" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/modules/controller/error/combac_error.js" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/combaa.py" afterPath="$PROJECT_DIR$/combaa.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/combac.py" afterPath="$PROJECT_DIR$/combac.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/combas.py" afterPath="$PROJECT_DIR$/combas.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libraries/base/combabase.py" afterPath="$PROJECT_DIR$/libraries/base/combabase.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libraries/database/broadcasts.py" afterPath="$PROJECT_DIR$/libraries/database/broadcasts.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/controller/combacontroller.py" afterPath="$PROJECT_DIR$/modules/controller/combacontroller.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/controller/zmqadapter.py" afterPath="$PROJECT_DIR$/modules/controller/zmqadapter.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/modules/scheduler/combascheduler.py" afterPath="$PROJECT_DIR$/modules/scheduler/combascheduler.py" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/setup development environment" afterPath="$PROJECT_DIR$/setup development environment" /> + </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -14,100 +27,110 @@ <file leaf-file-name="combam.py" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/combam.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="436"> - <caret line="65" column="0" lean-forward="true" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> + <state relative-caret-position="830"> + <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="combam_error.js" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/modules/monitor/error/combam_error.js"> + <file leaf-file-name="combamonitor.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/monitor/combamonitor.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" /> - <folding /> + <state relative-caret-position="270"> + <caret line="444" column="62" lean-forward="false" selection-start-line="444" selection-start-column="62" selection-end-line="444" selection-end-column="62" /> + <folding> + <element signature="e#43#52#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="schedulerconfig.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/libraries/base/schedulerconfig.py"> + <file leaf-file-name="combacontroller.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/controller/combacontroller.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="431"> - <caret line="172" column="60" lean-forward="true" selection-start-line="172" selection-start-column="60" selection-end-line="172" selection-end-column="60" /> - <folding /> + <state relative-caret-position="697"> + <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <folding> + <element signature="e#42#100#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="combamonitor.py" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/modules/monitor/combamonitor.py"> + <file leaf-file-name="zmqadapter.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/controller/zmqadapter.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1155"> - <caret line="454" column="51" lean-forward="true" selection-start-line="454" selection-start-column="51" selection-end-line="454" selection-end-column="51" /> + <state relative-caret-position="425"> + <caret line="40" column="104" lean-forward="false" selection-start-line="40" selection-start-column="104" selection-end-line="40" selection-end-column="104" /> <folding> - <element signature="e#43#52#0" expanded="true" /> + <element signature="e#0#32#0" expanded="true" /> </folding> </state> </provider> </entry> </file> - <file leaf-file-name="messenger.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/libraries/reporting/messenger.py"> + <file leaf-file-name="combac_error.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/controller/error/combac_error.js"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="476"> - <caret line="33" column="49" lean-forward="true" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" /> + <state relative-caret-position="762"> + <caret line="203" column="0" lean-forward="false" selection-start-line="203" selection-start-column="0" selection-end-line="203" selection-end-column="0" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="comba-cfg" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/comba-cfg"> + <file leaf-file-name="combas.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/combas.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="831"> - <caret line="636" column="0" lean-forward="false" selection-start-line="636" selection-start-column="0" selection-end-line="636" selection-end-column="0" /> - <folding /> + <state relative-caret-position="328"> + <caret line="53" column="0" lean-forward="true" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <folding> + <element signature="e#1052#1061#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="combamessage" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/combamessage"> + <file leaf-file-name="combascheduler.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/scheduler/combascheduler.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="831"> - <caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> + <state relative-caret-position="746"> + <caret line="474" column="35" lean-forward="true" selection-start-line="474" selection-start-column="35" selection-end-line="474" selection-end-column="35" /> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="combapasswd" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/combapasswd"> + <file leaf-file-name="models.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/modules/scheduler/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="986"> - <caret line="58" column="15" lean-forward="true" selection-start-line="58" selection-start-column="15" selection-end-line="58" selection-end-column="15" /> - <folding /> + <state relative-caret-position="289"> + <caret line="17" column="34" lean-forward="false" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" /> + <folding> + <element signature="e#46#61#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="combawhitelist" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/combawhitelist"> + <file leaf-file-name="broadcasts.py" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/libraries/database/broadcasts.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="780"> - <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" /> - <folding /> + <state relative-caret-position="34"> + <caret line="2" column="1" lean-forward="false" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" /> + <folding> + <element signature="e#73#100#0" expanded="true" /> + </folding> </state> </provider> </entry> </file> - <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/__init__.py"> + <file leaf-file-name="combabase.py" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/libraries/base/combabase.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="17"> - <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> + <state relative-caret-position="183"> + <caret line="48" column="39" lean-forward="true" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" /> <folding /> </state> </provider> @@ -127,28 +150,32 @@ <find>url</find> <find>defused</find> <find>service</find> + <find>lqs_socket</find> + <find>split</find> + <find>has_key</find> + <find>print</find> </findStrings> + <dirStrings> + <dir>$PROJECT_DIR$/libraries</dir> + <dir>$PROJECT_DIR$/modules</dir> + </dirStrings> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> - <option value="$PROJECT_DIR$/combaa.py" /> <option value="$PROJECT_DIR$/modules/archive/combaarchive.py" /> - <option value="$PROJECT_DIR$/libraries/database/broadcasts.py" /> <option value="$PROJECT_DIR$/libraries/reporting/statestore.py" /> <option value="$PROJECT_DIR$/libraries/reporting/mail.py" /> - <option value="$PROJECT_DIR$/combac.py" /> <option value="$PROJECT_DIR$/clientapi/python/combaclient.py" /> <option value="$PROJECT_DIR$/libraries/service/calendar.py" /> <option value="$PROJECT_DIR$/libraries/utils/audio.py" /> <option value="$PROJECT_DIR$/libraries/security/user.py" /> <option value="$PROJECT_DIR$/libraries/utils/parsexml.py" /> <option value="$PROJECT_DIR$/modules/controller/liquidsoap.py" /> - <option value="$PROJECT_DIR$/modules/controller/combacontroller.py" /> - <option value="$PROJECT_DIR$/modules/monitor/combamonitor.py" /> - <option value="$PROJECT_DIR$/combas.py" /> <option value="$PROJECT_DIR$/modules/scheduler/models.py" /> - <option value="$PROJECT_DIR$/modules/scheduler/combascheduler.py" /> <option value="$PROJECT_DIR$/combaweb.py" /> <option value="$PROJECT_DIR$/modules/web/__init__.py" /> <option value="$PROJECT_DIR$/modules/web/models.py" /> @@ -159,9 +186,7 @@ <option value="$PROJECT_DIR$/modules/web/views/auth/__init__.py" /> <option value="$PROJECT_DIR$/modules/web/views/viewmonitor.py" /> <option value="$PROJECT_DIR$/modules/web/views/viewsearch.py" /> - <option value="$PROJECT_DIR$/setup development environment" /> <option value="$PROJECT_DIR$/modules/web/views/viewpreprod.py" /> - <option value="$PROJECT_DIR$/libraries/base/combabase.py" /> <option value="$PROJECT_DIR$/tools/comba-cfg" /> <option value="$PROJECT_DIR$/tools/combamessage" /> <option value="$PROJECT_DIR$/tools/combawhitelist" /> @@ -171,15 +196,28 @@ <option value="$PROJECT_DIR$/combam.py" /> <option value="$PROJECT_DIR$/modules/monitor/error/combam_error.js" /> <option value="$PROJECT_DIR$/libraries/base/schedulerconfig.py" /> + <option value="$PROJECT_DIR$/modules/monitor/combamonitor.py" /> + <option value="$PROJECT_DIR$/setup development environment" /> + <option value="$PROJECT_DIR$/combaa.py" /> + <option value="$PROJECT_DIR$/combac.py" /> + <option value="$PROJECT_DIR$/libraries/base/combabase.py" /> + <option value="$PROJECT_DIR$/modules/controller/zmqadapter.py" /> + <option value="$PROJECT_DIR$/modules/controller/error/comba_error.js" /> + <option value="$PROJECT_DIR$/modules/controller/combacontroller.py" /> + <option value="$PROJECT_DIR$/modules/controller/error/combac_error.js" /> + <option value="$PROJECT_DIR$/combas.py" /> + <option value="$PROJECT_DIR$/modules/scheduler/combascheduler.py" /> + <option value="$PROJECT_DIR$/libraries/database/broadcasts.py" /> </list> </option> </component> <component name="ProjectFrameBounds"> - <option name="x" value="125" /> - <option name="y" value="31" /> - <option name="width" value="1400" /> + <option name="x" value="368" /> + <option name="y" value="60" /> + <option name="width" value="1485" /> <option name="height" value="1000" /> </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="" version="1"> <flattenPackages /> @@ -195,7 +233,6 @@ <foldersAlwaysOnTop value="true" /> </navigator> <panes> - <pane id="Scratches" /> <pane id="ProjectPane"> <subPane> <expand> @@ -208,18 +245,6 @@ <item name="comba" type="462c0819:PsiDirectoryNode" /> <item name="libraries" type="462c0819:PsiDirectoryNode" /> </path> - <path> - <item name="comba" type="b2602c69:ProjectViewProjectNode" /> - <item name="comba" type="462c0819:PsiDirectoryNode" /> - <item name="libraries" type="462c0819:PsiDirectoryNode" /> - <item name="base" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="comba" type="b2602c69:ProjectViewProjectNode" /> - <item name="comba" type="462c0819:PsiDirectoryNode" /> - <item name="libraries" type="462c0819:PsiDirectoryNode" /> - <item name="reporting" type="462c0819:PsiDirectoryNode" /> - </path> <path> <item name="comba" type="b2602c69:ProjectViewProjectNode" /> <item name="comba" type="462c0819:PsiDirectoryNode" /> @@ -229,17 +254,13 @@ <item name="comba" type="b2602c69:ProjectViewProjectNode" /> <item name="comba" type="462c0819:PsiDirectoryNode" /> <item name="modules" type="462c0819:PsiDirectoryNode" /> - <item name="monitor" type="462c0819:PsiDirectoryNode" /> - </path> - <path> - <item name="comba" type="b2602c69:ProjectViewProjectNode" /> - <item name="comba" type="462c0819:PsiDirectoryNode" /> - <item name="tools" type="462c0819:PsiDirectoryNode" /> + <item name="scheduler" type="462c0819:PsiDirectoryNode" /> </path> </expand> <select /> </subPane> </pane> + <pane id="Scratches" /> <pane id="Scope" /> </panes> </component> @@ -301,14 +322,15 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="125" y="31" width="1400" height="1000" extended-state="0" /> + <frame x="368" y="60" width="1485" height="1000" extended-state="0" /> + <editor active="true" /> <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.24964131" sideWeight="0.5" 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.23529412" sideWeight="0.5" 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.33" sideWeight="0.5" order="6" 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.33" sideWeight="0.5" order="7" side_tool="true" 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.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32997763" sideWeight="0.5" order="2" 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="false" weight="0.33" sideWeight="0.5" order="10" 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="10" 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="8" 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.25" sideWeight="0.5" order="1" 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="9" side_tool="false" content_ui="tabs" /> @@ -331,20 +353,6 @@ <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/modules/scheduler/models.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/modules/web/models.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="102"> - <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/combam.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="0"> @@ -437,13 +445,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/libraries/database/broadcasts.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2669"> - <caret line="157" column="12" lean-forward="false" selection-start-line="157" selection-start-column="12" selection-end-line="157" selection-end-column="12" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/libraries/utils/audio.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="544"> @@ -465,13 +466,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/controller/liquidsoap.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="119"> - <caret line="7" column="0" lean-forward="false" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/clientapi/python/combaclient.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="6545"> @@ -479,34 +473,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/controller/combacontroller.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="221"> - <caret line="13" column="14" lean-forward="true" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/combaa.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="442"> - <caret line="26" column="0" lean-forward="false" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/combac.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="2227"> - <caret line="131" column="40" lean-forward="false" selection-start-line="131" selection-start-column="40" selection-end-line="131" selection-end-column="40" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/combas.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="396"> - <caret line="33" column="11" lean-forward="false" selection-start-line="33" selection-start-column="11" selection-end-line="33" selection-end-column="11" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/libraries/utils/parsexml.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="357"> @@ -514,20 +480,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/scheduler/models.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="306"> - <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/modules/scheduler/combascheduler.py"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="340"> - <caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/combaweb.py"> <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="867"> @@ -595,9 +547,6 @@ <provider selected="true" editor-type-id="text-editor"> <state relative-caret-position="527"> <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" /> - <folding> - <element signature="e#47#113#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -609,102 +558,187 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/setup development environment"> + <entry file="file://$PROJECT_DIR$/tools/combawhitelist" /> + <entry file="file://$PROJECT_DIR$/tools/__init__.py" /> + <entry file="file://$PROJECT_DIR$/modules/monitor/error/combam_error.js" /> + <entry file="file://$PROJECT_DIR$/tools/combapasswd" /> + <entry file="file://$PROJECT_DIR$/tools/combamessage" /> + <entry file="file://$PROJECT_DIR$/tools/comba-cfg" /> + <entry file="file://$PROJECT_DIR$/libraries/reporting/messenger.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="170"> - <caret line="10" column="30" lean-forward="false" selection-start-line="10" selection-start-column="30" selection-end-line="10" selection-end-column="30" /> - <folding /> + <state relative-caret-position="476"> + <caret line="33" column="49" lean-forward="false" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" /> + <folding> + <marker date="1503391565076" expanded="true" signature="245:9171" ph="..." /> + <marker date="1503391565076" expanded="true" signature="709:1017" ph="..." /> + <marker date="1503391565076" expanded="true" signature="1150:1354" ph="..." /> + <marker date="1503391565076" expanded="true" signature="1159:1323" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="1503:1746" ph="..." /> + <marker date="1503391565076" expanded="true" signature="1512:1676" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="1913:3309" ph="..." /> + <marker date="1503391565076" expanded="true" signature="1922:2476" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="3096:3185" ph="..." /> + <marker date="1503391565076" expanded="true" signature="3217:3309" ph="..." /> + <marker date="1503391565076" expanded="true" signature="3431:3605" ph="..." /> + <marker date="1503391565076" expanded="true" signature="3440:3569" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="3741:3916" ph="..." /> + <marker date="1503391565076" expanded="true" signature="3750:3866" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="4079:4443" ph="..." /> + <marker date="1503391565076" expanded="true" signature="4088:4323" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="4608:5504" ph="..." /> + <marker date="1503391565076" expanded="true" signature="4617:4958" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="5655:5953" ph="..." /> + <marker date="1503391565076" expanded="true" signature="5664:5840" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="6103:6459" ph="..." /> + <marker date="1503391565076" expanded="true" signature="6112:6347" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="6611:6872" ph="..." /> + <marker date="1503391565076" expanded="true" signature="6620:6794" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="7020:7279" ph="..." /> + <marker date="1503391565076" expanded="true" signature="7029:7203" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="7426:7750" ph="..." /> + <marker date="1503391565076" expanded="true" signature="7435:7597" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="7896:8967" ph="..." /> + <marker date="1503391565076" expanded="true" signature="7905:8101" ph=""""..."""" /> + <marker date="1503391565076" expanded="true" signature="8148:8927" ph="..." /> + <marker date="1503391565076" expanded="true" signature="9092:9171" ph="..." /> + <marker date="1503391565076" expanded="true" signature="9101:9153" ph=""""..."""" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/libraries/base/combabase.py"> + <entry file="file://$PROJECT_DIR$/libraries/base/schedulerconfig.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="631"> - <caret line="62" column="35" lean-forward="false" selection-start-line="62" selection-start-column="35" selection-end-line="62" selection-end-column="35" /> + <state relative-caret-position="2856"> + <caret line="177" column="60" lean-forward="false" selection-start-line="177" selection-start-column="60" selection-end-line="177" selection-end-column="60" /> <folding> - <element signature="e#1028#1037#0" expanded="true" /> + <marker date="1503391565072" expanded="true" signature="6271:6453" ph="..." /> + <marker date="1503391565072" expanded="true" signature="6588:6939" ph="..." /> </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/combawhitelist"> + <entry file="file://$PROJECT_DIR$/setup development environment"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="780"> - <caret line="74" column="26" lean-forward="false" selection-start-line="74" selection-start-column="26" selection-end-line="74" selection-end-column="26" /> + <state relative-caret-position="272"> + <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/__init__.py"> + <entry file="file://$PROJECT_DIR$/combaa.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="17"> - <caret line="1" column="0" lean-forward="true" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> + <state relative-caret-position="517"> + <caret line="90" column="73" lean-forward="false" selection-start-line="90" selection-start-column="73" selection-end-line="90" selection-end-column="73" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/combam.py"> + <entry file="file://$PROJECT_DIR$/combac.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="436"> - <caret line="65" column="0" lean-forward="true" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> + <state relative-caret-position="1224"> + <caret line="150" column="14" lean-forward="true" selection-start-line="150" selection-start-column="14" selection-end-line="150" selection-end-column="14" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/monitor/error/combam_error.js"> + <entry file="file://$PROJECT_DIR$/modules/controller/liquidsoap.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="51"> - <caret line="3" column="5" lean-forward="false" selection-start-line="3" selection-start-column="5" selection-end-line="3" selection-end-column="5" /> - <folding /> + <state relative-caret-position="544"> + <caret line="38" column="33" lean-forward="true" selection-start-line="38" selection-start-column="33" selection-end-line="38" selection-end-column="33" /> + <folding> + <element signature="e#42#51#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/combapasswd"> + <entry file="file://$PROJECT_DIR$/modules/controller/zmqadapter.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="986"> - <caret line="58" column="15" lean-forward="true" selection-start-line="58" selection-start-column="15" selection-end-line="58" selection-end-column="15" /> - <folding /> + <state relative-caret-position="425"> + <caret line="40" column="104" lean-forward="false" selection-start-line="40" selection-start-column="104" selection-end-line="40" selection-end-column="104" /> + <folding> + <element signature="e#0#32#0" expanded="true" /> + </folding> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/combamessage"> + <entry file="file://$PROJECT_DIR$/modules/controller/combacontroller.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="831"> - <caret line="58" column="0" lean-forward="false" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" /> + <state relative-caret-position="697"> + <caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <folding> + <element signature="e#42#100#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/modules/controller/error/combac_error.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="762"> + <caret line="203" column="0" lean-forward="false" selection-start-line="203" selection-start-column="0" selection-end-line="203" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tools/comba-cfg"> + <entry file="file://$PROJECT_DIR$/combam.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="831"> - <caret line="636" column="0" lean-forward="false" selection-start-line="636" selection-start-column="0" selection-end-line="636" selection-end-column="0" /> + <state relative-caret-position="830"> + <caret line="65" column="0" lean-forward="false" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/libraries/reporting/messenger.py"> + <entry file="file://$PROJECT_DIR$/modules/monitor/combamonitor.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="476"> - <caret line="33" column="49" lean-forward="true" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" /> + <state relative-caret-position="270"> + <caret line="444" column="62" lean-forward="false" selection-start-line="444" selection-start-column="62" selection-end-line="444" selection-end-column="62" /> + <folding> + <element signature="e#43#52#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/libraries/base/combabase.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="183"> + <caret line="48" column="39" lean-forward="true" selection-start-line="48" selection-start-column="39" selection-end-line="48" selection-end-column="39" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/libraries/base/schedulerconfig.py"> + <entry file="file://$PROJECT_DIR$/combas.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="431"> - <caret line="172" column="60" lean-forward="true" selection-start-line="172" selection-start-column="60" selection-end-line="172" selection-end-column="60" /> + <state relative-caret-position="328"> + <caret line="53" column="0" lean-forward="true" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> + <folding> + <element signature="e#1052#1061#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/modules/scheduler/combascheduler.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="746"> + <caret line="474" column="35" lean-forward="true" selection-start-line="474" selection-start-column="35" selection-end-line="474" selection-end-column="35" /> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/modules/monitor/combamonitor.py"> + <entry file="file://$PROJECT_DIR$/modules/scheduler/models.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="1155"> - <caret line="454" column="51" lean-forward="true" selection-start-line="454" selection-start-column="51" selection-end-line="454" selection-end-column="51" /> + <state relative-caret-position="289"> + <caret line="17" column="34" lean-forward="false" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" /> <folding> - <element signature="e#43#52#0" expanded="true" /> + <element signature="e#46#61#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/libraries/database/broadcasts.py"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="34"> + <caret line="2" column="1" lean-forward="false" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" /> + <folding> + <element signature="e#73#100#0" expanded="true" /> </folding> </state> </provider> diff --git a/combaa.py b/combaa.py index 194883d58a5cba8f96ee2cd557f839411ba30156..b156da88f09d778349806279cd49139c0e7a00a8 100644 --- a/combaa.py +++ b/combaa.py @@ -88,7 +88,7 @@ if __name__ == "__main__": logginglevels = {'debug': logging.DEBUG, 'info': logging.INFO, 'warning': logging.WARNING, 'error': logging.ERROR, 'critical': logging.CRITICAL} setLogLevel = config.get('loglevel') - loglevel = logginglevels[setLogLevel] if logginglevels.has_key(setLogLevel) else logging.DEBUG + loglevel = logginglevels[setLogLevel] if setLogLevel in logginglevels else logging.DEBUG logging.basicConfig(filename=config.get('logdir') + '/archive.log', format='%(asctime)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', diff --git a/combac.py b/combac.py index 7c40bdae83de152b7f191cfbb81f2290de35bf44..5336e718c0e53e8ece82e2e4beedb1600461f03b 100644 --- a/combac.py +++ b/combac.py @@ -115,7 +115,7 @@ if __name__ == "__main__": # lOGGING logginglevels = {'debug' : logging.DEBUG, 'info' : logging.INFO, 'warning': logging.WARNING, 'error': logging.ERROR, 'critical': logging.CRITICAL} setLogLevel = config.get('loglevel') - loglevel = logginglevels[setLogLevel] if logginglevels.has_key(setLogLevel) else logging.DEBUG + loglevel = logginglevels[setLogLevel] if setLogLevel in logginglevels else logging.DEBUG logging.basicConfig(filename=config.get('logdir') + '/comba.log', format='%(asctime)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', diff --git a/combas.py b/combas.py index 98442b36c82c8bab3390fd7f7206a7b9076df8e0..ffc324b2bc46f4f727c0a877bfe70b1c7eae5530 100644 --- a/combas.py +++ b/combas.py @@ -52,7 +52,7 @@ def getAccount(): pass time.sleep(1) - return db.get('internAccess').split(':') + return db.get('internAccess').decode().split(':') if __name__ == "__main__": """ @@ -121,7 +121,7 @@ if __name__ == "__main__": logginglevels = {'debug' : logging.DEBUG, 'info' : logging.INFO, 'warning': logging.WARNING, 'error': logging.ERROR, 'critical': logging.CRITICAL} LOGFILE = config.get('logdir').replace('"', '').strip() + '/scheduler.log' setLogLevel = config.get('loglevel').replace('"', '').strip() - LOGLEVEL = logginglevels[setLogLevel] if logginglevels.has_key(setLogLevel) else logging.DEBUG + LOGLEVEL = logginglevels[setLogLevel] if setLogLevel in logginglevels else logging.DEBUG logging.basicConfig(filename=LOGFILE, format='%(asctime)s %(message)s', datefmt='%Y-%m-%d %H:%M:%S', level=LOGLEVEL) # Den in der Ini bezeichneten Communikations-Adapter verwenden diff --git a/libraries/base/combabase.py b/libraries/base/combabase.py index 5190946147c59abe46d1a19419d9ca6ce4b156dc..91f8c9b07229725ddb86f5a48efc03d069ac5e32 100644 --- a/libraries/base/combabase.py +++ b/libraries/base/combabase.py @@ -48,7 +48,10 @@ class CombaBase(object): @type value: mixed @param value: Beliebiger Wert """ - self.__dict__[key] = value + if(key == "securitylevel"): + self.__dict__[key] = int(value) + else: + self.__dict__[key] = value #------------------------------------------------------------------------------------------# def get(self, key, default=None): diff --git a/libraries/database/broadcasts.py b/libraries/database/broadcasts.py index 72588e763d090c380fb0640da35045fb7425036e..16127e2b2f3bd0620a31d5b1862fd3f9ad395272 100644 --- a/libraries/database/broadcasts.py +++ b/libraries/database/broadcasts.py @@ -1,6 +1,6 @@ __author__ = 'michel' # -*- coding: utf-8 -*- -from mongoengine import * +#from mongoengine import * import datetime, os, urllib from datetime import timedelta from urllib.request import urlopen diff --git a/modules/controller/combacontroller.py b/modules/controller/combacontroller.py index 1579c1df94f0baf5fb39bbe2da7d050aed39cd17..5ee9e202117d2d4f8c7d915669cf184a11b4a6d9 100644 --- a/modules/controller/combacontroller.py +++ b/modules/controller/combacontroller.py @@ -51,6 +51,7 @@ class CombaController(object): self.job_result = ['', '', '', '','', ''] errors_file = os.path.dirname(os.path.realpath(__file__)) + '/error/combac_error.js' json_data = open(errors_file) + self.errorData = simplejson.load(json_data) #------------------------------------------------------------------------------------------# diff --git a/modules/controller/error/combac_error.js b/modules/controller/error/combac_error.js index b58384b794e31298bd3c889793a9fe779010945d..cbcf942d8f56767d828a6c7ee7db858c8e6f6fa7 100644 --- a/modules/controller/error/combac_error.js +++ b/modules/controller/error/combac_error.js @@ -201,3 +201,4 @@ "00": "Userlist was successfully delivered", "01": "Not enough access rights for this operation" } +} diff --git a/modules/controller/zmqadapter.py b/modules/controller/zmqadapter.py index 82163f01759c433fa5999a0fc95aeef7460e9199..a062931f0724b415fd42b6ad3135af9526dd1cd9 100644 --- a/modules/controller/zmqadapter.py +++ b/modules/controller/zmqadapter.py @@ -2,7 +2,6 @@ from modules.controller import * from libraries.base.combabase import CombaBase import threading import zmq -import sys import time import zmq.auth import redis @@ -38,7 +37,8 @@ class CombaZMQAdapter(threading.Thread, CombaBase): self.socket.plain_server = True self.socket.bind("tcp://*:"+self.port) self.shutdown_event.clear() - self.controller = CombaController(self, self.lqs_socket, self.lqs_recorder_socket) +# self.controller = CombaController(self, self.lqs_socket, self.lqs_recorder_socket) + self.controller = CombaController(self, "/var/run/comba/playd.sock", "/var/run/comba/record.sock") self.controller.messenger.setMailAddresses(self.get('frommail'), self.get('adminmail')) self.can_send = False # Process tasks forever @@ -116,6 +116,7 @@ class CombaZMQAdapter(threading.Thread, CombaBase): # stop auth server if running if self.authserver.is_alive(): self.authserver.stop() + if self.securitylevel > 0: # Authentifizierungsserver starten. diff --git a/modules/scheduler/combascheduler.py b/modules/scheduler/combascheduler.py index 58e319cd29dd02d55e7a4a4a9d75a11ddd4e5313..e704260f0f4f44827df55a2ce9cf9d46bc52a7a3 100644 --- a/modules/scheduler/combascheduler.py +++ b/modules/scheduler/combascheduler.py @@ -311,7 +311,7 @@ class CombaScheduler(CombaBase): day_offset = 1 if (today_time >= next_time) else 0 # Ist ein Tag angegeben - if data.has_key('day'): + if 'day' in data: try: #Montag ist 0 dayofweek = int(data['day']) @@ -336,7 +336,7 @@ class CombaScheduler(CombaBase): # Events feuern, zum stoppen und starten einer Playlist # TODO: Diese events müssen bei einem Reset gelöscht werden # Es sollte sicher sein, einfach alle keys mit playerevent_*_playliststart unc playerevent_*_playliststop zu löschen - if data.has_key('job'): + if 'job' in data: if data['job'] == 'play_playlist': event = {'job': 'play_playlist', 'date': date_human, 'time': time_human} self.messenger.queueAddEvent('playliststart', str(schedule_time_human).replace(' ', 'T'), event, @@ -443,7 +443,8 @@ class CombaScheduler(CombaBase): # Vorproduktion in den nächsten 20 Sekunden vorgemerkt? tracks = ModelBroadcastEventOverrides.upcoming(datetime.datetime.now(),20) - + #print(tracks) + print(type(tracks)) if tracks and len(tracks) > 0: # alle tracks enthalten die Information über den zugehörigen broadcast event event = tracks[0].broadcast_event @@ -668,7 +669,7 @@ class CombaScheduler(CombaBase): hasData = isinstance(data, (dict)) and len(data) > 0 - if self.errorData.has_key(job): + if job in self.errorData: errMsg = self.errorData[job][errornumber] errID = self.errorData[job]['id'] + str(errornumber) if hasData: diff --git a/setup development environment b/setup development environment index d7251ecb53c7f136efbc0947b07c9ea40f96a0be..dbf9c90b97d2e55b53f9564c886fca9d06f8a945 100644 --- a/setup development environment +++ b/setup development environment @@ -1,4 +1,4 @@ -apt-get install python3 python3-pip python3-magic libev-dev +apt-get install python3 python3-pip python3-magic libev-dev redis-server pip3 install redis pip3 install simplejson @@ -12,4 +12,5 @@ pip3 install flask-mongoengine pip3 install python-dateutil pip3 install zmq -pip3 install defusedexpat # libraries/utils/parsexml.py \ No newline at end of file +pip3 install defusedexpat # libraries/utils/parsexml.py +