Structural pattern

src/covidify/covidify_data.py

@@ -0,0 +1,11 @@
+from convidify.sources import github, wiki
+
+"""
+global values
+"""
+class DataStoreBridge():
+    def jhu_sources(self):
+        return github.get()
+
+    def wiki_sources(self):
+        return github.get() 

src/covidify/data_prep.py → src/covidify/covidify_prep.py

@@ -3,7 +3,6 @@
 Usage:
     data_prep.py [options]
     data_prep.py -h | --help
-
 Options:
     -h --help             Show this message.
     --output_folder=OUT   Output folder for the data and reports to be saved.
@@ -21,7 +20,7 @@
 from difflib import get_close_matches
 from datetime import datetime, date, time 
 
-from covidify.sources import github, wiki
+from covidify.covidify_data import DataStore
 from covidify.config import REPO, TMP_FOLDER, TMP_GIT, DATA
 from covidify.utils.utils import replace_arg_score
 
@@ -42,11 +41,13 @@
     country = None
 
 if source == 'JHU':
-    df = github.get()
+    datastore = DataStore()
+    df = datastore.jhu_sources()
 
 elif source == 'wiki':
     print('Apologies, the wikipedia source is not ready yet - getting github data')
-    df = github.get()
+    datastore = DataStore()
+    df = datastore.wiki_sources()
 
 
 
@@ -151,7 +152,6 @@ def get_exp_moving_average(tmp, col):
 Calculate the number of people that are ACTUALLY infected on a given day
 currently infected = sum of people date - (recovored + died)
 ex: 5 = 10 - (4 - 1)
-
 '''
 current_infected = pd.DataFrame([])
 current_infected['currently_infected'] = (df.groupby('file_date').confirmed.sum() - (df.groupby('file_date').deaths.sum() + df.groupby('file_date').recovered.sum()))

src/covidify/list_countries.py

@@ -9,12 +9,13 @@
 import click
 import covidify
 import numpy as np
-from covidify.sources import github
-from covidify.config import SCRIPT
+from covidify.covidify_data import DataStore
+from config import SCRIPT
 
 def get_countries():
     print('Getting available countries...')
-    df = github.get()
+    datastore = DataStore()
+    df = datastore.jhu_sources()
     df = df[df.confirmed > 0]
 
     countries = sorted(list(set(df.country.values)))

src/covidify/sources/github.py

@@ -157,7 +157,6 @@ def get():
             sys.exit(1)
 
     sheets = os.listdir(DATA)
-
     # Clean the result to the sheet tabs we want
     print('Getting sheets...')
     cleaned_sheets = clean_sheet_names(sheets)