Merge branch 'develop'

Author: leafcoder

demo_proj/manage.py

@@ -3,6 +3,9 @@
 import os
 import sys
 
+# import django_covid19 from parent dir
+sys.path.insert(0, '..')
+
 
 def main():
     os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'ncov.settings')

demo_proj/ncov/settings.py

@@ -186,7 +186,6 @@
     # 每分钟抓取丁香园数据一次
     ('*/1 * * * *', 'django.core.management.call_command', ['crawl', 'dxy']),
 
-    # 下午4点到6点间每10分钟抓取 covidtracking 数据一次
-    ('*/10 16-18 * * *', 'django.core.management.call_command', ['crawl', 'covidtracking'])
+    # 每小时0分时开始抓取 covidtracking 数据一次
+    ('0 * * * *', 'django.core.management.call_command', ['crawl', 'covidtracking'])
 )
-

django_covid19/spider/nCoV/spiders/covidtracking.py

@@ -126,8 +126,8 @@ def parse_current_states(self, response):
         result = json.loads(response.text)
         for item in result:
             state = item['state']
-            daily_state_url = self.daily_state_url_template % state
-            current_state_url = self.current_state_url_template % state
+            daily_state_url = self.daily_state_url_template % state.lower()
+            current_state_url = self.current_state_url_template % state.lower()
             state_item = states[state]
             state_item.update(item)
             state_item.pop('grade', None)
@@ -194,4 +194,4 @@ def get_current_confirmed(self, data):
     def get_current_confirmed_incr(self, data):
         positive = data['positiveIncrease'] if data.get('positiveIncrease') else 0
         death = data['deathIncrease'] if data.get('deathIncrease') else 0
-        return positive - death
+        return positive - death