Finalizado y testeado localmente refresher, listo para testear en
entorno.
This commit is contained in:
pablomartincalvo
parent
8f5a120096
commit
3fdbc5f766
5 changed files with 501 additions and 144 deletions
323
.idea/workspace.xml
generated
323
.idea/workspace.xml
generated
|
|
@ -2,10 +2,11 @@
|
|||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="6e2fbba0-85ff-42d6-8e70-e4cdef1000c8" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/refresher/refresher.py" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/tests/refresher_tests.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/capturer/capturer.py" beforeDir="false" afterPath="$PROJECT_DIR$/capturer/capturer.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/db_layer/capturas_interface.py" beforeDir="false" afterPath="$PROJECT_DIR$/db_layer/capturas_interface.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/refresher/refresher.py" beforeDir="false" afterPath="$PROJECT_DIR$/refresher/refresher.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
|
|
@ -17,7 +18,7 @@
|
|||
<session id="1687213926">
|
||||
<usages-collector id="statistics.lifecycle.project">
|
||||
<counts>
|
||||
<entry key="project.closed" value="5" />
|
||||
<entry key="project.closed" value="6" />
|
||||
<entry key="project.open.time.0" value="1" />
|
||||
<entry key="project.open.time.12" value="1" />
|
||||
<entry key="project.open.time.13" value="2" />
|
||||
|
|
@ -25,17 +26,18 @@
|
|||
<entry key="project.open.time.17" value="1" />
|
||||
<entry key="project.open.time.18" value="1" />
|
||||
<entry key="project.open.time.21" value="1" />
|
||||
<entry key="project.opened" value="10" />
|
||||
<entry key="project.open.time.26" value="1" />
|
||||
<entry key="project.opened" value="11" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.extensions.open">
|
||||
<counts>
|
||||
<entry key="py" value="47" />
|
||||
<entry key="py" value="49" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.open">
|
||||
<counts>
|
||||
<entry key="Python" value="44" />
|
||||
<entry key="Python" value="46" />
|
||||
<entry key="Scratch" value="3" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
|
|
@ -44,16 +46,16 @@
|
|||
<entry key="Python Console" value="1579" />
|
||||
<entry key="capturer" value="862" />
|
||||
<entry key="dummy" value="14" />
|
||||
<entry key="py" value="16307" />
|
||||
<entry key="py" value="17003" />
|
||||
<entry key="scratch_1" value="489" />
|
||||
<entry key="txt" value="990" />
|
||||
<entry key="txt" value="1009" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.file.types.edit">
|
||||
<counts>
|
||||
<entry key="PLAIN_TEXT" value="1004" />
|
||||
<entry key="Python" value="19067" />
|
||||
<entry key="Scratch" value="170" />
|
||||
<entry key="PLAIN_TEXT" value="1023" />
|
||||
<entry key="Python" value="19661" />
|
||||
<entry key="Scratch" value="272" />
|
||||
</counts>
|
||||
</usages-collector>
|
||||
<usages-collector id="statistics.vcs.git.usages">
|
||||
|
|
@ -73,14 +75,18 @@
|
|||
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret selection-end-line="60" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="210">
|
||||
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
||||
<state>
|
||||
<caret selection-end-line="3" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -88,28 +94,23 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="29" column="37" lean-forward="true" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
|
||||
<state relative-caret-position="660">
|
||||
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
|
||||
<folding>
|
||||
<marker date="1539537667973" expanded="true" signature="646:655" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="646:729" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="750:759" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="864:873" ph="..." />
|
||||
<marker date="1539717431052" expanded="true" signature="1271:1277" ph="..." />
|
||||
<marker date="1539717431052" expanded="true" signature="1298:1307" ph="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
|
||||
<entry file="file://$PROJECT_DIR$/tests/refresher_tests.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
||||
<state relative-caret-position="120">
|
||||
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<marker date="1539537667985" expanded="true" signature="166:167" ph="..." />
|
||||
<marker date="1539537667985" expanded="true" signature="166:172" ph="..." />
|
||||
<marker date="1539537667985" expanded="true" signature="459:468" ph="..." />
|
||||
<element signature="e#123#18418#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -118,8 +119,8 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
|
||||
<state relative-caret-position="435">
|
||||
<caret line="39" selection-start-line="39" selection-end-line="42" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -149,8 +150,8 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/explorer/explorer.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="330">
|
||||
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="90" />
|
||||
<state relative-caret-position="600">
|
||||
<caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -158,7 +159,7 @@
|
|||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="300">
|
||||
<state relative-caret-position="690">
|
||||
<caret line="47" selection-start-line="47" selection-end-line="47" />
|
||||
<folding>
|
||||
<element signature="e#24#46#0" expanded="true" />
|
||||
|
|
@ -167,11 +168,26 @@
|
|||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/capturer/capturer.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
|
||||
<state relative-caret-position="450">
|
||||
<caret line="36" selection-start-line="36" selection-end-line="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="240">
|
||||
<caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<marker date="1539717431060" expanded="true" signature="166:167" ph="..." />
|
||||
<marker date="1539717431060" expanded="true" signature="166:172" ph="..." />
|
||||
<marker date="1539717431060" expanded="true" signature="470:471" ph="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -224,15 +240,16 @@
|
|||
<option value="$PROJECT_DIR$/geocoder/geocoder.py" />
|
||||
<option value="$PROJECT_DIR$/mysql/capturing_tasks_interface.py" />
|
||||
<option value="$PROJECT_DIR$/mysql/capturas_interface.py" />
|
||||
<option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py" />
|
||||
<option value="$PROJECT_DIR$/tests/capturing_tests.py" />
|
||||
<option value="$PROJECT_DIR$/tests/capturer_tests.py" />
|
||||
<option value="$PROJECT_DIR$/core/mysql_wrapper.py" />
|
||||
<option value="$PROJECT_DIR$/explorer/explorer.py" />
|
||||
<option value="$PROJECT_DIR$/db_layer/capturing_tasks_interface.py" />
|
||||
<option value="$PROJECT_DIR$/db_layer/capturas_interface.py" />
|
||||
<option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py" />
|
||||
<option value="$PROJECT_DIR$/capturer/capturer.py" />
|
||||
<option value="$PROJECT_DIR$/refresher/refresher.py" />
|
||||
<option value="$PROJECT_DIR$/db_layer/capturas_interface.py" />
|
||||
<option value="$PROJECT_DIR$/tests/refresher_tests.py" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -246,6 +263,7 @@
|
|||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="Scope" />
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
|
|
@ -253,6 +271,16 @@
|
|||
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="db_layer" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="refresher" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="Drogon" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="Drogon" type="462c0819:PsiDirectoryNode" />
|
||||
|
|
@ -275,7 +303,6 @@
|
|||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
|
|
@ -300,28 +327,7 @@
|
|||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="RunManager" selected="Python.capturer">
|
||||
<configuration name="alerts" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<module name="Drogon" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<envs>
|
||||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/core" />
|
||||
<option name="IS_MODULE_SDK" value="true" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/core/alerts.py" />
|
||||
<option name="PARAMETERS" value="" />
|
||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<option name="MODULE_MODE" value="false" />
|
||||
<option name="REDIRECT_INPUT" value="false" />
|
||||
<option name="INPUT_FILE" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<component name="RunManager" selected="Python.refresher_tests">
|
||||
<configuration name="capturer" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<module name="Drogon" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
|
|
@ -385,7 +391,7 @@
|
|||
<option name="INPUT_FILE" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="scratch_1" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<configuration name="refresher_tests" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<module name="Drogon" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
|
|
@ -393,6 +399,24 @@
|
|||
<env name="PYTHONUNBUFFERED" value="1" />
|
||||
</envs>
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/tests" />
|
||||
<option name="IS_MODULE_SDK" value="true" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/tests/refresher_tests.py" />
|
||||
<option name="PARAMETERS" value="" />
|
||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
||||
<option name="EMULATE_TERMINAL" value="false" />
|
||||
<option name="MODULE_MODE" value="false" />
|
||||
<option name="REDIRECT_INPUT" value="false" />
|
||||
<option name="INPUT_FILE" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="scratch_1" type="PythonConfigurationType" factoryName="Python" temporary="true">
|
||||
<module name="Drogon" />
|
||||
<option name="INTERPRETER_OPTIONS" value="" />
|
||||
<option name="PARENT_ENVS" value="true" />
|
||||
<option name="SDK_HOME" value="" />
|
||||
<option name="WORKING_DIRECTORY" value="$APPLICATION_CONFIG_DIR$/scratches" />
|
||||
<option name="IS_MODULE_SDK" value="false" />
|
||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||
|
|
@ -407,19 +431,19 @@
|
|||
<method v="2" />
|
||||
</configuration>
|
||||
<list>
|
||||
<item itemvalue="Python.alerts" />
|
||||
<item itemvalue="Python.scratch_1" />
|
||||
<item itemvalue="Python.capturer" />
|
||||
<item itemvalue="Python.capturer_tests" />
|
||||
<item itemvalue="Python.explorer" />
|
||||
<item itemvalue="Python.refresher_tests" />
|
||||
</list>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Python.refresher_tests" />
|
||||
<item itemvalue="Python.scratch_1" />
|
||||
<item itemvalue="Python.capturer" />
|
||||
<item itemvalue="Python.explorer" />
|
||||
<item itemvalue="Python.capturer_tests" />
|
||||
<item itemvalue="Python.capturer" />
|
||||
<item itemvalue="Python.capturer" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
|
|
@ -518,7 +542,14 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1539530388252</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="13" />
|
||||
<task id="LOCAL-00013" summary="Iniciado refresher.">
|
||||
<created>1539537857221</created>
|
||||
<option name="number" value="00013" />
|
||||
<option name="presentableId" value="LOCAL-00013" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1539537857221</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="14" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TodoView" selected-index="1">
|
||||
|
|
@ -534,14 +565,14 @@
|
|||
<frame x="0" y="-2" width="1920" height="1082" extended-state="6" />
|
||||
<editor active="true" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.48251748" visible="true" weight="0.14918292" />
|
||||
<window_info id="Structure" order="1" sideWeight="0.5174825" side_tool="true" visible="true" weight="0.14918292" />
|
||||
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.48076922" weight="0.14918292" />
|
||||
<window_info id="Structure" order="1" sideWeight="0.5192308" side_tool="true" weight="0.14918292" />
|
||||
<window_info id="Favorites" order="2" sideWeight="0.5015674" side_tool="true" weight="0.14918292" />
|
||||
<window_info active="true" id="Repositories" order="3" sideWeight="0.49529782" visible="true" weight="0.32999474" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32983193" />
|
||||
<window_info anchor="bottom" id="Run" order="2" weight="0.32983193" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.39915967" />
|
||||
<window_info anchor="bottom" id="Debug" order="3" weight="0.39915967" />
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49973643" weight="0.32878152" />
|
||||
|
|
@ -553,6 +584,26 @@
|
|||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
</layout>
|
||||
<layout-to-restore>
|
||||
<window_info content_ui="combo" id="Project" order="0" sideWeight="0.48076922" visible="true" weight="0.14918292" />
|
||||
<window_info id="Structure" order="1" sideWeight="0.5192308" side_tool="true" visible="true" weight="0.14918292" />
|
||||
<window_info id="Favorites" order="2" sideWeight="0.5015674" side_tool="true" weight="0.14918292" />
|
||||
<window_info active="true" id="Repositories" order="3" sideWeight="0.49529782" visible="true" weight="0.32999474" />
|
||||
<window_info anchor="bottom" id="Message" order="0" />
|
||||
<window_info anchor="bottom" id="Find" order="1" weight="0.32983193" />
|
||||
<window_info anchor="bottom" id="Run" order="2" weight="0.32983193" />
|
||||
<window_info active="true" anchor="bottom" id="Debug" order="3" visible="true" weight="0.39915967" />
|
||||
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
||||
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
||||
<window_info anchor="bottom" id="TODO" order="6" sideWeight="0.49973643" weight="0.32878152" />
|
||||
<window_info anchor="bottom" id="Version Control" order="7" sideWeight="0.49973643" weight="0.269958" />
|
||||
<window_info anchor="bottom" id="Terminal" order="8" weight="0.32983193" />
|
||||
<window_info anchor="bottom" id="Event Log" order="9" sideWeight="0.5007907" side_tool="true" weight="0.32983193" />
|
||||
<window_info anchor="bottom" id="Python Console" order="10" sideWeight="0.49920928" weight="0.32983193" />
|
||||
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
||||
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
||||
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
||||
</layout-to-restore>
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
|
|
@ -596,7 +647,8 @@
|
|||
<MESSAGE value="Testeos en desarrollo del sistema de capturas. Pequeños retoques." />
|
||||
<MESSAGE value="Puesto mains en explorer y capturer." />
|
||||
<MESSAGE value="Puesto bien mains en explorer y capturer." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Puesto bien mains en explorer y capturer." />
|
||||
<MESSAGE value="Iniciado refresher." />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="Iniciado refresher." />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<breakpoint-manager>
|
||||
|
|
@ -628,6 +680,11 @@
|
|||
</expression>
|
||||
</expressions>
|
||||
<expressions id="evaluateExpression">
|
||||
<expression>
|
||||
<expression-string>cursor_result.fetchone()</expression-string>
|
||||
<language-id>Python</language-id>
|
||||
<evaluation-mode>EXPRESSION</evaluation-mode>
|
||||
</expression>
|
||||
<expression>
|
||||
<expression-string>capturing_interface.seconds_since_last_try()</expression-string>
|
||||
<language-id>Python</language-id>
|
||||
|
|
@ -668,11 +725,6 @@
|
|||
<language-id>Python</language-id>
|
||||
<evaluation-mode>EXPRESSION</evaluation-mode>
|
||||
</expression>
|
||||
<expression>
|
||||
<expression-string>self.get_tasks_created_today()</expression-string>
|
||||
<language-id>Python</language-id>
|
||||
<evaluation-mode>EXPRESSION</evaluation-mode>
|
||||
</expression>
|
||||
</expressions>
|
||||
</component>
|
||||
<component name="editorHistoryManager">
|
||||
|
|
@ -688,13 +740,6 @@
|
|||
<entry file="file://$PROJECT_DIR$/capturer/__init__.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="615">
|
||||
<caret line="41" selection-start-line="41" selection-end-line="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/core/scrapping_utils.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="225">
|
||||
|
|
@ -734,9 +779,6 @@
|
|||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="105">
|
||||
<caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
|
||||
<folding>
|
||||
<element signature="e#0#46#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -768,13 +810,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file:///usr/lib/python3/dist-packages/mysql/connector/cursor.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="18720">
|
||||
<caret line="1254" selection-start-line="1254" selection-end-line="1254" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$APPLICATION_HOME_DIR$/helpers/pydev/_pydev_imps/_pydev_execfile.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="255">
|
||||
|
|
@ -789,33 +824,23 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
|
||||
<entry file="file:///usr/lib/python3/dist-packages/mysql/connector/cursor.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="45">
|
||||
<caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
|
||||
<state relative-caret-position="18720">
|
||||
<caret line="1254" selection-start-line="1254" selection-end-line="1254" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
|
||||
<entry file="file://$PROJECT_DIR$/geocoder/geocoder.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="210">
|
||||
<caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/explorer/explorer.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="330">
|
||||
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="90" />
|
||||
<state relative-caret-position="615">
|
||||
<caret line="41" selection-start-line="41" selection-end-line="41" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="300">
|
||||
<state relative-caret-position="690">
|
||||
<caret line="47" selection-start-line="47" selection-end-line="47" />
|
||||
<folding>
|
||||
<element signature="e#24#46#0" expanded="true" />
|
||||
|
|
@ -823,36 +848,72 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
|
||||
<entry file="file://$PROJECT_DIR$/explorer/explorer.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="29" column="37" lean-forward="true" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
|
||||
<folding>
|
||||
<marker date="1539537667973" expanded="true" signature="646:655" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="646:729" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="750:759" ph="..." />
|
||||
<marker date="1539537667973" expanded="true" signature="864:873" ph="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="285">
|
||||
<caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<marker date="1539537667985" expanded="true" signature="166:167" ph="..." />
|
||||
<marker date="1539537667985" expanded="true" signature="166:172" ph="..." />
|
||||
<marker date="1539537667985" expanded="true" signature="459:468" ph="..." />
|
||||
</folding>
|
||||
<state relative-caret-position="600">
|
||||
<caret line="139" column="40" selection-start-line="139" selection-start-column="40" selection-end-line="139" selection-end-column="40" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/capturer/capturer.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="420">
|
||||
<caret line="34" lean-forward="true" selection-start-line="34" selection-end-line="34" />
|
||||
<state relative-caret-position="450">
|
||||
<caret line="36" selection-start-line="36" selection-end-line="36" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturing_tasks_interface.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="39" selection-start-line="39" selection-end-line="42" selection-end-column="23" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret selection-end-line="3" selection-end-column="53" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/refresher/refresher.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="240">
|
||||
<caret line="16" column="24" selection-start-line="16" selection-start-column="24" selection-end-line="16" selection-end-column="24" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<marker date="1539717431060" expanded="true" signature="166:167" ph="..." />
|
||||
<marker date="1539717431060" expanded="true" signature="166:172" ph="..." />
|
||||
<marker date="1539717431060" expanded="true" signature="470:471" ph="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="660">
|
||||
<caret line="55" column="20" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="20" />
|
||||
<folding>
|
||||
<marker date="1539717431052" expanded="true" signature="1271:1277" ph="..." />
|
||||
<marker date="1539717431052" expanded="true" signature="1298:1307" ph="..." />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state>
|
||||
<caret selection-end-line="60" selection-end-column="3" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/tests/refresher_tests.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="120">
|
||||
<caret line="68" column="14" selection-start-line="68" selection-start-column="14" selection-end-line="68" selection-end-column="14" />
|
||||
<folding>
|
||||
<element signature="e#123#18418#0" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
|
|||
|
|
@ -29,8 +29,10 @@ class Capturer:
|
|||
|
||||
if task.status == 'Data ready':
|
||||
ad_data = task.get_ad_data()
|
||||
elif Refresher.dead_ad_checker(task.html):
|
||||
task._update_status('Dead ad')
|
||||
continue
|
||||
else:
|
||||
Refresher.dead_ad_checker(task.html)
|
||||
continue
|
||||
|
||||
capturas_interface.insert_captura(ad_data)
|
||||
|
|
|
|||
|
|
@ -21,13 +21,41 @@ class CapturasInterface():
|
|||
self.anunciosdb.query(query_statement, query_parameters)
|
||||
|
||||
def old_ads_exist(self):
|
||||
#TODO Mira si hay algun anuncio que este viejete y necesite refresco
|
||||
query_statement = """
|
||||
SELECT uc.referencia
|
||||
FROM anuncios.ultima_captura_full as uc
|
||||
LEFT JOIN (SELECT cl.ad_url as ad_url
|
||||
FROM tasks.capturing_last as cl
|
||||
WHERE cl.status = 'Dead ad') as da
|
||||
ON da.ad_url LIKE CONCAT('%', uc.referencia, '%')
|
||||
WHERE uc.fecha_captura < (NOW() - INTERVAL 10 day)
|
||||
AND da.ad_url is null
|
||||
"""
|
||||
|
||||
cursor_result = self.anunciosdb.query(query_statement)
|
||||
resultados = cursor_result.fetchall()
|
||||
if resultados:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
def get_old_ad(self):
|
||||
#TODO Recuperar anuncio que este viejete y que necesite refresco
|
||||
|
||||
def mark_dead_ad(self, referencia):
|
||||
#TODO Marca un anuncio como muerto
|
||||
query_statement = """
|
||||
SELECT uc.referencia
|
||||
FROM anuncios.ultima_captura_full as uc
|
||||
LEFT JOIN (SELECT cl.ad_url as ad_url
|
||||
FROM tasks.capturing_last as cl
|
||||
WHERE cl.status = 'Dead ad') as da
|
||||
ON da.ad_url LIKE CONCAT('%', uc.referencia, '%')
|
||||
WHERE uc.fecha_captura < (NOW() - INTERVAL 10 day)
|
||||
AND da.ad_url is null
|
||||
LIMIT 1
|
||||
"""
|
||||
cursor_result = self.anunciosdb.query(query_statement, dictionary=True)
|
||||
try:
|
||||
return c
|
||||
except:
|
||||
return None
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,20 @@ class Refresher:
|
|||
old_ad = capturas_interface.get_old_ad()
|
||||
capturing_interface.create_capturing_task(old_ad['referencia'])
|
||||
|
||||
|
||||
def dead_ad_checker(self, html):
|
||||
#TODO Comprueba si el anuncio esta muerto y, si es asi, lo marca en la tabla de capturas
|
||||
|
||||
|
||||
if blabla:
|
||||
capturas_interface.mark_dead_ad(referencia)
|
||||
@staticmethod
|
||||
def dead_ad_checker(html):
|
||||
"""
|
||||
Comprueba si el html es de un anuncio dado de baja.
|
||||
:param html: HTML del anuncio en string.
|
||||
:return: True si esta dado de baja, False si no.
|
||||
"""
|
||||
if ':-|' in html or 'El anunciante lo dio de baja' in html:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
259
tests/refresher_tests.py
Normal file
259
tests/refresher_tests.py
Normal file
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue