base currencies and point change added for cryptos

api_caller.py

@@ -48,29 +48,33 @@ def readCryptoCSV(file_path, max_stocks):
     CSV = csv.reader(f)
     next(CSV)
     i = 0
+    unique_bases = []
     for row in CSV:
         print(row)
         if i < max_stocks:
             i += 1
          
             try: 
-                symbol, name, current_price, opening_price = row
+                symbol, name, base, current_price, opening_price = row
                 symbols.append(symbol)
                 names.append(name)
-                stock_info[name] = [symbol, current_price, opening_price]
+                stock_info[name] = [symbol, base, current_price, opening_price]
+                if base not in unique_bases:
+                    unique_bases.append(base)
             except: 
-                symbol = row[0]
-                name = row[1]
+                symbol, name, base = row
+                if base not in unique_bases:
+                    unique_bases.append(base)
                 symbols.append(symbol)
                 names.append(name)
-                stock_info[name] = [symbol]
+                stock_info[name] = [symbol, base]
         else:
             print('max stocks exceeded')
             break
             
     f.close()
     
-    return names, stock_info
+    return names, stock_info, unique_bases
    
 def emptyInfo(symbols, stock_info):
     update = False
@@ -91,10 +95,9 @@ def updateStockPrices(symbols):
         quotes = [finnhubClient.quote(symbol) for symbol in symbols]
         current_prices = [quote['c'] for quote in quotes]
         opening_prices = [quote['o'] for quote in quotes]
-        print(current_prices)
-        print(opening_prices)
        
-        print(current_prices, opening_prices)
+
+
         CSV = open('csv/tickers.csv', 'w+')
         CSV.write('name,current,opening\n')
         for i, symbol in enumerate(symbols):
@@ -166,18 +169,21 @@ def updateStockPricesIEX(symbols):
         CSV.write(symbol + ',' + str(current_prices[i]) + ',' +  str(opening_prices[i]) + '\n')
     CSV.close()
         
-    print(lasts)
     
 
 
-def updateCrypto(coins, coin_info):
-    response = coingecko_client.get_price(ids=','.join(coins), vs_currencies = 'usd', include_24hr_change=True)
+
+def updateCrypto(coins, coin_info, unique_bases):
+    response = coingecko_client.get_price(ids=','.join(coins), vs_currencies = unique_bases, include_24hr_change=True)
+    
     CSV = open('csv/crypto.csv', 'w+')
-    CSV.write('symbol,name,current,24hr change\n')
+    CSV.write('symbol,name,base,current,24hr change\n')
     
     for coin in coins:
+        info = coin_info[coin]
+        print(info)
         
-        CSV.write(coin_info[coin][0] + ',' + coin+ ',' + str(response[coin]['usd']) + ',' +  str(response[coin]['usd_24h_change']) + '\n')
+        CSV.write(info[0] + ',' + coin + ',' + info[1] + ',' +str(response[coin][info[1]]) + ',' +  str(response[coin]['usd_24h_change']) + '\n')
     CSV.close()
 
 
@@ -224,16 +230,14 @@ if __name__ == '__main__':
 
     NY_time = datetime.now(NY_zone)
 
-    print(NY_time)
     symbols, stock_info = readCSV('csv/tickers.csv', max_stocks)
     updateStockPrices(symbols)
     updateUpdate(NY_time)
   
     while True:
-        coins, coin_info = readCryptoCSV('csv/crypto.csv', max_stocks)
-        print(coins)
-        print(coin_info)
-        updateCrypto(coins, coin_info)
+        coins, coin_info, unique_bases = readCryptoCSV('csv/crypto.csv', max_stocks)
+        
+        updateCrypto(coins, coin_info, unique_bases)
         
         updateNews()
         
@@ -256,7 +260,7 @@ if __name__ == '__main__':
             f = open('csv/last_update.csv', 'r')
             CSV = csv.reader(f)
             last_update_str = next(CSV)[0]
-            print(last_update_str)
+           
             last_update = datetime.strptime(last_update_str, "%d/%m/%Y %H:%M:%S")
             
             yday_closing = closing - dt.timedelta(days=1)
@@ -264,7 +268,7 @@ if __name__ == '__main__':
             yday_closing = datetime.strptime(yday_str, "%d/%m/%Y %H:%M:%S")
             
             
-            print(last_update < yday_closing)
+        
             if last_update < yday_closing:
                 
                 updateStockPrices(symbols)

csv/crypto.csv

@@ -1,3 +1,3 @@
-symbol,name,current,24hr change
-BTC,bitcoin,38402,16.47581759149
-ETH,ethereum,2550.15,29.546988294381478
+symbol,name,base,current,24hr change
+BTC,bitcoin,usd,38061,0.15138810082760248
+ETH,ethereum,gbp,1841.33,1.197151365974607

csv/last_update.csv

@@ -1 +1 @@
-24/05/2021 15:58:28
+25/05/2021 14:54:13

csv/news.csv

@@ -1,21 +1,21 @@
 headline
-UK in race between Covid vaccines and variant, experts warn - The Guardian
-Up to 8,700 patients died after catching Covid in English hospitals - The Guardian
-Heysham explosion: Cut gas pipe caused fatal blast, say police - BBC News
-Buhari orders postponement of FEC, Police Council meeting - Guardian
-Explained: Why are doctors prescribing blood thinners to COVID patients? - Times of India
-'Have you gone bonkers!' Australian ridicules Prince Harry for Archie's first words claim - Express
-Oilers’ Josh Archibald suspended one game for clipping Jets’ Logan Stanley - Sportsnet.ca
-Fire tears through commercial building in downtown New Westminster - CTV News Vancouver
-Airlines are avoiding Belarus after 'state-sponsored hijacking' of Ryanair flight - CNN
-India vs England series itinerary unlikely to change after ECB-BCCI back-channel talks - Times of India
-Epic Games Faces Apple in Final Day of Courtroom Battle Over Monopoly Claims - The Wall Street Journal
-Damiano David: Eurovision winner cleared of drug use by broadcaster - BBC News
-Nova Scotia reports 49 new COVID-19 cases Monday, active total drops to 894 - CTV News Atlantic
-NASA confirms time of Wednesday's super blood moon in Ireland - and where it will be visible to observers - Irish Mirror
-Horror caught on CCTV: Man dies after bike dodges check post in Telangana - Hindustan Times
-Presidency: Southern governors' plan to enforce open grazing ban is of questionable legality - TheCable
-Former CDC head urges kids’ COVID-19 vaccinations as agency probes rare heart issues - Fox News
-iOS 14.6 now available with new Apple Podcasts subscriptions - The Verge
-Impeachment Witness Gordon Sondland Is Suing Mike Pompeo And U.S. For $1.8 Million - NPR
-Blinken Dispatched to Middle East Amid Israel-Gaza Truce - The Wall Street Journal
+COVID-19 LIVE UPDATES | SA says consensus reached for talks on pandemic treaty - TimesLIVE
+WHO, DOST set crucial vaccine tests for Pinoys - INQUIRER.net
+Huawei to unveil new OS - The Manila Times
+Total lunar eclipse 2021: How to see the super flower blood moon - MARCA.com
+NBI given 10 days to file initial probe findings into 'vaccine for sale' scam | Joel R. San Juan - Business Mirror
+BTS single "Butter" breaks three world records across YouTube and Spotify - Guinness World Records
+“Super Flower Blood Moon” to be visible to southern Albertans early Wednesday morning - Lethbridge News Now
+U.S. will reopen consulate in Jerusalem, Secretary of State Blinken announces - CBC.ca
+18 COVID-19 community cases in Singapore, including Sengkang General Hospital housekeeper - CNA
+When to see the total lunar eclipse and 'flower' supermoon - CNN
+Match Highlights BAN vs SL 2nd ODI Updates: Ton-Up Mushfiqur Rahim And Bowlers Shine as Bangladesh Beat Sri L - India.com
+Central Bank bans former mortgage firm MD as gardaí investigate - The Irish Times
+Build 2021: Here’s everything Microsoft announced at its annual developer conference - The Indian Express
+GLOBALink | Exploring Mars with China's Zhurong rover - Daily News Egypt
+Axiom Space lines up second private flight to the ISS, led by record-holding astronaut Peggy Whitson - CNBC
+COVID-19: Councils say travel not prohibited after meeting government officials over local lockdown fears - Sky News
+Prince Harry makes heartbreakingly sweet comment about 'mummy' Princess Diana in unearthed video showing his once strong bond with Prince William - woman&home
+COVID: India's 'white fungus' infections raise new health concerns - DW (English)
+Cllr slammed by party colleagues over child benefit 'subsidy to have sex' claim - Dublin Live
+Rand Paul points finger at 80s pop star after receiving suspicious powder - The Guardian

csv/tickers.csv

@@ -1,4 +1,4 @@
 name,current,opening
-MSFT,250.7,247.785
-NFLX,502.95,501.05
-GOOG,2406.68,2367
+MSFT,251.215,251.769
+NFLX,500.28,506
+GOOG,2406.31,2420