From 5d261328b87833ce749bd887d23bf890622a3585 Mon Sep 17 00:00:00 2001
From: pablomartincalvo <pablomartincalvo@gmail.com>
Date: Fri, 19 Oct 2018 18:05:35 +0200
Subject: [PATCH] Ajustado error de tipos en dead_ad_checker.

---
 .idea/workspace.xml    | 203 ++++++++++++++++++-----------------------
 capturer/capturer.py   |   1 +
 refresher/refresher.py |   9 +-
 3 files changed, 96 insertions(+), 117 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 70217a9..33df90f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,8 +5,8 @@
       <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$/geocoder/geocoder.py" beforeDir="false" afterPath="$PROJECT_DIR$/geocoder/geocoder.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/refresher/refresher.py" beforeDir="false" afterPath="$PROJECT_DIR$/refresher/refresher.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/capturer_tests.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/capturer_tests.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -26,42 +26,41 @@
           <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.open.time.22" value="1" />
           <entry key="project.open.time.26" value="1" />
-          <entry key="project.opened" value="12" />
+          <entry key="project.opened" value="11" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="py" value="57" />
+          <entry key="py" value="73" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="Python" value="54" />
-          <entry key="Scratch" value="3" />
+          <entry key="Python" value="68" />
+          <entry key="Scratch" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="Python Console" value="1579" />
+          <entry key="Python Console" value="1597" />
           <entry key="capturer" value="862" />
           <entry key="dummy" value="14" />
-          <entry key="py" value="17298" />
+          <entry key="py" value="18394" />
           <entry key="scratch_1" value="489" />
-          <entry key="txt" value="1172" />
+          <entry key="txt" value="1114" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="PLAIN_TEXT" value="1186" />
-          <entry key="Python" value="19891" />
-          <entry key="Scratch" value="337" />
+          <entry key="PLAIN_TEXT" value="1128" />
+          <entry key="Python" value="21070" />
+          <entry key="Scratch" value="272" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.vcs.git.usages">
         <counts>
-          <entry key="git.branch.checkout.local" value="1" />
+          <entry key="git.branch.checkout.local" value="2" />
           <entry key="git.branch.create.new" value="1" />
         </counts>
       </usages-collector>
@@ -77,8 +76,8 @@
           <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="1382">
-                  <caret line="264" column="45" selection-start-line="264" selection-start-column="45" selection-end-line="264" selection-end-column="45" />
+                <state relative-caret-position="465">
+                  <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
                 </state>
               </provider>
             </entry>
@@ -86,8 +85,11 @@
           <file pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/db_layer/capturas_interface.py">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="550">
+                <state relative-caret-position="-194">
                   <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
+                  <folding>
+                    <marker date="1539964895728" expanded="true" signature="2060:2402" ph="..." />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -106,6 +108,11 @@
               <provider selected="true" editor-type-id="text-editor">
                 <state relative-caret-position="615">
                   <caret line="41" selection-start-line="41" selection-end-line="41" />
+                  <folding>
+                    <marker date="1539964895724" expanded="true" signature="150:194" ph="..." />
+                    <marker date="1539964895724" expanded="true" signature="210:220" ph="..." />
+                    <marker date="1539964895724" expanded="true" signature="210:429" ph="..." />
+                  </folding>
                 </state>
               </provider>
             </entry>
@@ -123,11 +130,11 @@
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="true">
+          <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="285">
-                  <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+                <state relative-caret-position="255">
+                  <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
                 </state>
               </provider>
             </entry>
@@ -141,11 +148,11 @@
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="false">
+          <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="615">
-                  <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
+                <state relative-caret-position="405">
+                  <caret line="27" column="27" lean-forward="true" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
                 </state>
               </provider>
             </entry>
@@ -153,7 +160,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="690">
+                <state relative-caret-position="705">
                   <caret line="47" selection-start-line="47" selection-end-line="47" />
                   <folding>
                     <element signature="e#24#46#0" expanded="true" />
@@ -219,19 +226,19 @@
         <option value="$PROJECT_DIR$/core/task.py" />
         <option value="$PROJECT_DIR$/capturer/__init__.py" />
         <option value="$PROJECT_DIR$/capturer/geocoder.py" />
-        <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="$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$/tests/refresher_tests.py" />
         <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py" />
-        <option value="$PROJECT_DIR$/refresher/refresher.py" />
-        <option value="$PROJECT_DIR$/tests/capturer_tests.py" />
-        <option value="$PROJECT_DIR$/capturer/capturer.py" />
+        <option value="$PROJECT_DIR$/tests/refresher_tests.py" />
         <option value="$PROJECT_DIR$/db_layer/capturas_interface.py" />
+        <option value="$PROJECT_DIR$/geocoder/geocoder.py" />
+        <option value="$PROJECT_DIR$/capturer/capturer.py" />
+        <option value="$PROJECT_DIR$/refresher/refresher.py" />
       </list>
     </option>
   </component>
@@ -308,10 +315,6 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
   </component>
   <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/db_layer" />
-      <recent name="$PROJECT_DIR$/refresher" />
-    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/geocoder" />
     </key>
@@ -444,10 +447,10 @@
     <recent_temporary>
       <list>
         <item itemvalue="Python.capturer_tests" />
-        <item itemvalue="Python.scratch_1" />
         <item itemvalue="Python.refresher" />
         <item itemvalue="Python.refresher_tests" />
         <item itemvalue="Python.capturer" />
+        <item itemvalue="Python.scratch_1" />
       </list>
     </recent_temporary>
   </component>
@@ -560,35 +563,7 @@
       <option name="project" value="LOCAL" />
       <updated>1539717575817</updated>
     </task>
-    <task id="LOCAL-00015" summary="Añadidos varios __init__.py">
-      <created>1539895536301</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1539895536301</updated>
-    </task>
-    <task id="LOCAL-00016" summary="Añadidos varios __init__.py">
-      <created>1539895633918</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1539895633918</updated>
-    </task>
-    <task id="LOCAL-00017" summary="Añadidos varios __init__.py">
-      <created>1539895689933</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1539895689933</updated>
-    </task>
-    <task id="LOCAL-00018" summary="Corregido tiempo de sleep.">
-      <created>1539895990019</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1539895990019</updated>
-    </task>
-    <option name="localTasksCounter" value="19" />
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="TodoView" selected-index="1">
@@ -604,7 +579,7 @@
     <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.48076922" visible="true" weight="0.14918292" />
+      <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" 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" />
@@ -618,7 +593,7 @@
       <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 active="true" anchor="bottom" id="Python Console" order="10" sideWeight="0.49920928" visible="true" 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" />
@@ -688,9 +663,7 @@
     <MESSAGE value="Puesto bien mains en explorer y capturer." />
     <MESSAGE value="Iniciado refresher." />
     <MESSAGE value="Finalizado y testeado localmente refresher, listo para testear en&#10;entorno." />
-    <MESSAGE value="Añadidos varios __init__.py" />
-    <MESSAGE value="Corregido tiempo de sleep." />
-    <option name="LAST_COMMIT_MESSAGE" value="Corregido tiempo de sleep." />
+    <option name="LAST_COMMIT_MESSAGE" value="Finalizado y testeado localmente refresher, listo para testear en&#10;entorno." />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -722,31 +695,6 @@
       </expression>
     </expressions>
     <expressions id="evaluateExpression">
-      <expression>
-        <expression-string>not re.match(r&quot;[0-9]{1,20}&quot;, self.ad_fields['telefono']['value'])</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>not 'Distrito' in self.ad_fields['distrito']['value']</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>not 'Barrio' in self.ad_fields['barrio']['value']</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>self.ad_fields['barrio']['value']</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
-      <expression>
-        <expression-string>self.ad_fields['distrito']['value']</expression-string>
-        <language-id>Python</language-id>
-        <evaluation-mode>EXPRESSION</evaluation-mode>
-      </expression>
       <expression>
         <expression-string>capturas_interface.old_ads_exist()</expression-string>
         <language-id>Python</language-id>
@@ -767,6 +715,31 @@
         <language-id>Python</language-id>
         <evaluation-mode>EXPRESSION</evaluation-mode>
       </expression>
+      <expression>
+        <expression-string>return cursor.fetchone()[0]</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>capturing_interface.get_pending_task() is None</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>execution_cursor.execute(query_statement, query_parameters)</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>uuid_exploring</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
+      <expression>
+        <expression-string>self.database_is_up()</expression-string>
+        <language-id>Python</language-id>
+        <evaluation-mode>EXPRESSION</evaluation-mode>
+      </expression>
     </expressions>
   </component>
   <component name="editorHistoryManager">
@@ -859,13 +832,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/refresher_tests.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="258" column="30" lean-forward="true" selection-start-line="258" selection-start-column="30" selection-end-line="258" selection-end-column="30" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file:///usr/lib/python3/dist-packages/apport_python_hook.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="316">
@@ -880,11 +846,12 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/refresher/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/db_layer/__init__.py">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/tests/refresher_tests.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="796">
+          <caret line="258" column="30" selection-start-line="258" selection-start-column="30" selection-end-line="258" selection-end-column="30" />
+        </state>
+      </provider>
     </entry>
     <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch_1.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -897,6 +864,11 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="615">
           <caret line="41" selection-start-line="41" selection-end-line="41" />
+          <folding>
+            <marker date="1539964895724" expanded="true" signature="150:194" ph="..." />
+            <marker date="1539964895724" expanded="true" signature="210:220" ph="..." />
+            <marker date="1539964895724" expanded="true" signature="210:429" ph="..." />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -916,7 +888,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/core/mysql_wrapper.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="690">
+        <state relative-caret-position="705">
           <caret line="47" selection-start-line="47" selection-end-line="47" />
           <folding>
             <element signature="e#24#46#0" expanded="true" />
@@ -934,31 +906,34 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/refresher/refresher.py">
+    <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="615">
-          <caret line="41" lean-forward="true" selection-start-line="41" selection-end-line="41" />
+        <state relative-caret-position="255">
+          <caret line="17" lean-forward="true" selection-start-line="17" selection-end-line="17" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/capturer/capturer.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1382">
-          <caret line="264" column="45" selection-start-line="264" selection-start-column="45" selection-end-line="264" selection-end-column="45" />
+        <state relative-caret-position="465">
+          <caret line="57" lean-forward="true" selection-start-line="57" selection-end-line="57" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/capturer_tests.py">
+    <entry file="file://$PROJECT_DIR$/refresher/refresher.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="405">
+          <caret line="27" column="27" lean-forward="true" selection-start-line="27" selection-start-column="27" selection-end-line="27" selection-end-column="27" />
         </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="550">
+        <state relative-caret-position="-194">
           <caret line="45" column="45" lean-forward="true" selection-start-line="45" selection-start-column="45" selection-end-line="45" selection-end-column="45" />
+          <folding>
+            <marker date="1539964895728" expanded="true" signature="2060:2402" ph="..." />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/capturer/capturer.py b/capturer/capturer.py
index 2c47108..d5e6c49 100644
--- a/capturer/capturer.py
+++ b/capturer/capturer.py
@@ -54,6 +54,7 @@ class CapturingTask:
         self.uuid_exploring = parameters['fk_uuid_exploring']
         self.status = parameters['status']
         self.request_failures = 1
+        self.html = None
 
         self._update_status('Loading')
 
diff --git a/refresher/refresher.py b/refresher/refresher.py
index 01e1d4f..8aba225 100644
--- a/refresher/refresher.py
+++ b/refresher/refresher.py
@@ -23,9 +23,12 @@ class Refresher:
         :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:
+        try:
+            if ':-|' in html or 'El anunciante lo dio de baja' in html:
+                return True
+            else:
+                return False
+        except TypeError:
             return False