diff --git a/scripts/fetcher.py b/scripts/fetcher.py index 7f40029..db599be 100644 --- a/scripts/fetcher.py +++ b/scripts/fetcher.py @@ -19,7 +19,10 @@ cur.append(str(s.attributes['currency'].value)) rates.append(float(s.attributes['rate'].value)) except: - pass + try: + rates.remove(float(s.attributes['rate'].value)) + except: + pass for s in itemlist: try: diff --git a/scripts/pusher.py b/scripts/pusher.py index cc41a50..7a56920 100644 --- a/scripts/pusher.py +++ b/scripts/pusher.py @@ -12,20 +12,19 @@ 'NZD', 'PHP', 'SGD', 'THB', 'ZAR'] -def get_cleaned(line, codes): +def get_cleaned(line, codes, date): i = 0 new_line = [] new_codes = [] - del line[0] + if not date: + del line[0] del line[-1] - for x in line: if x != 'N/A': new_codes.append(codes[i]) new_line.append(line[i]) i += 1 - return new_line, new_codes @@ -68,17 +67,17 @@ def dict_gen(row, currency, currency_codes, date): x = 0 for row in spamreader: date = row[0] - new_line, new_codes = get_cleaned(row, codes) + new_line, new_codes = get_cleaned(row, codes, '') if x == 0: x += 1 continue # for EUR - eur_new_line, eur_new_codes = get_cleaned(row[:], codes[:]) + eur_new_line, eur_new_codes = get_cleaned(row[:], codes[:], date) eur_ = dict_gen(eur_new_line, currency="EUR", currency_codes=eur_new_codes, date=date) - print (json.dumps(eur_)) + db_prices.insert_one(eur_) # end EUR block