Updated for imported data format

[covid19.git] / publish.py

diff --git a/publish.py b/publish.py
index 8ed4adb114363ce8e30a187e7a22dbb89b82aa39..8c970560fa9fa4840c5e966cf7cb85e3f98c3ede 100644 (file)
--- a/publish.py
+++ b/publish.py
@@ -16,6 +16,7 @@ import os
 
 import matplotlib as mpl
 import matplotlib.pyplot as plt
+# # %matplotlib inline
 
 
 # %%
@@ -220,23 +221,7 @@ with open('covid_summary.md', 'a') as f:
 
 # %%
 os.system('pandoc --toc -s covid_summary.md > covid_summary.html')
-
-
-# %%
 os.system('scp covid_summary.html neil@ogedei:/var/www/scripts.njae.me.uk/covid/index.html')
-os.system('scp covid_deaths_total_linear.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp cases_and_deaths.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp cases_and_deaths_last_60_days.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp deaths-radar-2021.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp covid_deaths_per_week.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp fraction_positive_tests.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/    ')
-os.system('scp tests_and_cases.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp deaths_by_date_last_6_weeks.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp fraction_positive_tests_vs_tests.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp tests_vs_fraction_positive_animation.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/   ')
-os.system('scp people_in_hospital.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp cases_admissions_deaths.png neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-
 
 # %%
 with open('uk_covid_deaths.js', 'w') as f:
@@ -254,20 +239,35 @@ with open('last_uk_date.js', 'w') as f:
 with open('last_intl_date.js', 'w') as f:
     f.write(f"document.write('{pd.to_datetime(last_intl_date).strftime('%d %B %Y')}');")
 
-
 # %%
-os.system('scp uk_covid_deaths.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp uk_deaths_30_days.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp uk_cases_30_days.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-# # !scp estimated_total_deaths.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/
-# # !scp excess_deaths_upto.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/
-os.system('scp last_uk_date.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp last_intl_date.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-os.system('scp hospital_normalisation_date.js neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
-
+transfer_files = [
+    'covid_deaths_total_linear.png',
+    'cases_and_deaths.png',
+    'cases_and_deaths_last_60_days.png',
+    'deaths-radar-2021.png',
+    'covid_deaths_per_week.png',
+    'fraction_positive_tests.png',
+    'tests_and_cases.png',
+    'deaths_by_date_last_6_weeks.png',
+    'fraction_positive_tests_vs_tests.png',
+    'tests_vs_fraction_positive_animation.png',
+    'people_in_hospital.png',
+    'cases_admissions_deaths.png',
+    'uk_covid_deaths.js',
+    'uk_deaths_30_days.js',
+    'uk_cases_30_days.js',
+    'last_uk_date.js',
+    'last_intl_date.js',
+    'hospital_normalisation_date.js'
+]
 
 # %%
+for f in transfer_files:
+    if os.path.isfile(f):
+        os.system(f'scp {f} neil@ogedei:/var/www/scripts.njae.me.uk/covid/')
+        print(f'Transferred {f}')
+    else:
+        print('Cannot transfer {f}: file does not exist')
 
-
-
+# %%