image creation fefactor started

setup.sh

@@ -9,7 +9,7 @@ pip3 install geopy
 sudo apt-get install libopenjp2-7
 sudo apt-get install libtiff5
 
-chmod -R ugo+rwx display_images
+sudo chmod -R ugo+rwx display_images
 cd rpi-rgb-led-matrix
 sudo apt-get update && sudo apt-get install python3-dev python3-pillow -y
 make build-python PYTHON=$(which python3)

stockTicker.py

@@ -652,23 +652,27 @@ class StockTicker():
     
     def getCryptoImage(self):
         
+        
+        f = open('csv/crypto_settings.json', 'r')
+        all_crypto_settings = json.load(f)
+        f.close()
+        
+        if all_crypto_settings['title']:
             title_img = self.openImage('feature_titles/crypto.png')
             image_list = [title_img]
             image_list.append(self.blank)
         
-        start = time.time()
-        self.readCryptoCSV()
         
-        for i, coin in enumerate(self.coins):
         
-            info = self.coin_info[coin]
+        coin_info = all_crypto_settings['symbols']
+        coin_bases = list(coin_info.keys())
      
-            change = float(info[3]) #TEXT
-            ticker = info[0] #TEXT
-            current =  float(info[2]) #TEXT
-            base = info[1].upper()
+        for i, cb in enumerate(coin_bases):
+            ticker, base = cb.split(',')
+            current = coin_info[cb]["current"]
+            change = coin_info[cb]["24hr_change"]
 
-            if self.points: 
+            if all_crypto_settings["point"]: 
                 # convert percent to points
                 change = change/100 * current
                 
@@ -741,29 +745,37 @@ class StockTicker():
         return finalDisplayImage
     
     def getForexImage(self):
+        
+        f = open('csv/forex_settings.json', 'r')
+        all_forex_settings = json.load(f)
+        f.close()
+    
+        if all_forex_settings['title']:
             title_img = self.openImage('feature_titles/forex.png')
             image_list = [title_img]
             image_list.append(self.blank)
             
-        start = time.time()
-        base, currency_info = json.load(open('csv/currency.json', 'r'))
-        currencies = ['AUD', 'CAD', 'CHF', 'EUR', 'GBP', 'JPY', 'NZD']
+        forex_settings = all_forex_settings['symbols']
         
-        for i, currency in enumerate(currencies):
-            current, yesterday = currency_info[currency]
-            change = 1/current - 1/yesterday
         
-            current = 1/current
+        symbol_bases = list(forex_settings.keys())
+        
+        for i, sb in enumerate(symbol_bases):
+            symbol, base = sb.split(',')
+            
+            current = forex_settings[sb]['current']
+            change = forex_settings[sb]['24hr_change']
+       
             current = '%.3f' % current
    
             arrow, change = self.getArrow(change)
             change = '%.6f' % change
-            midFrame = self.textToImage(currency + '(' + base + ')', current, change, arrow) #IMAGE THE TEXT
+            midFrame = self.textToImage(symbol+ '(' + base + ')', current, change, arrow) #IMAGE THE TEXT
 
             try: 
                 logos_path = os.path.join(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos'), 'currencies')
                
-                logo = Image.open(os.path.join(logos_path,  currency.lower() + '.png'))
+                logo = Image.open(os.path.join(logos_path,  symbol.lower() + '.png'))
                 bse = Image.open(os.path.join(logos_path,  base.lower() + '.png'))
                 
                 new_im = Image.new('RGB', (32, 32))
@@ -839,22 +851,33 @@ class StockTicker():
         return finalDisplayImage
     
     def getStockImage(self):
+        
+        
+        
+        f = open('csv/stocks_settings.json', 'r')
+        all_stocks_settings = json.load(f)
+        f.close()
+        
+        if all_stocks_settings['title']:
             title_img = self.openImage('feature_titles/stocks.png')
             image_list = [title_img]
             image_list.append(self.blank)
         
-        start = time.time()
-        self.readStocksCSV()
+        
+        symbols = []
+        stock_info = {}
+        
+        stock_info = all_stocks_settings['symbols']
+        symbols = list(stock_info.keys())
+
+        for i, symbol in enumerate(symbols):
             
             
-        for i, symbol in enumerate(self.symbols):
+            info = stock_info[symbol]
             
-            
-            info = self.stock_info[symbol]
-            
-            change = float(info[0])-float(info[1]) #TEXT
+            change = float(info['current'])-float(info['opening']) #TEXT
             ticker = symbol #TEXT
-            current = '%.2f' % float(info[0]) #TEXT
+            current = '%.2f' % float(info['current']) #TEXT
             
             arrow, change = self.getArrow(change)
             change = '%.2f' % change
@@ -937,28 +960,28 @@ class StockTicker():
         
     def getNewsImage(self):
         
+        all_settings = json.load(open('csv/news_settings.json', 'r'))
+        
+        if all_settings['title']:
             title_img = self.openImage('feature_titles/news.png')
+            image_list = [title_img]
+            
         headline_font = ImageFont.load("./fonts/6x13.pil")
         source_font = ImageFont.load("./fonts/6x13.pil")
         
-        image_list = [title_img]
+        headline_info = all_settings['headlines']
         
         headlines = []
         source_date_times = []
         sources = []
         
-        f = open('csv/news.csv', 'r')
-        CSV = csv.reader(f)
-        next(CSV)
-        for row in CSV:
-            headline, source, date, time = row
-            headlines.append(headline)
-            source_date_times.append(source + ': ' + date + ' ' + time)
-            sources.append(source)
         
-        f.close()
 
-        for i, headline in enumerate(headlines):
+        for i, hi in enumerate(headline_info):
+            headline, source, date_time = hi
+            date, time = date_time.split('T')
+            time = time[:-1]
+            source_date_time = source + ': ' + date + ' ' + time
             
             headline = headline.replace("^", ",")
             headline = headline.replace("’", "'")
@@ -973,10 +996,10 @@ class StockTicker():
             headline = lst[0]
             
             headline_img = self.textImage(headline, headline_font, matrix_height = True)
-            source_img = self.textImage(source_date_times[i], source_font, r=255, g=255, b=0, matrix_height = True)
+            source_img = self.textImage(source_date_time, source_font, r=255, g=255, b=0, matrix_height = True)
 
             try:
-                logo_name = sources[i].lower().replace(' ', '-')
+                logo_name = sources.lower().replace(' ', '-')
                 logos_path = os.path.join(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos'), 'news_logos')
            
                 logo = Image.open(os.path.join(logos_path,  logo_name + '.png'))
@@ -1640,13 +1663,13 @@ class StockTicker():
     def getDailyWeatherImage(self):
         
         
-        f = open( "csv/weather_location.txt", 'r' )
-        line = next(f)
-        locations = line.split(',')
-        f.close()
+        all_settings = json.load(open('csv/daily_weather.json', 'r'))
         
+        if all_settings['title']:
             title_img = self.openImage('feature_titles/forecast.png')
             imgs = [title_img, self.blank]
+        else:
+            imgs = []
         
         current_weathers = json.load(open('csv/current_weather.json', 'r'))
         
@@ -1793,42 +1816,6 @@ class StockTicker():
         return self.stitchImage(imgs)
     
         
-    #Retrieve symbols and stock info from the csv file 
-    def readStocksCSV(self):
-        
-        self.symbols = []
-        self.stock_info = {}
-        f = open('csv/tickers.csv', 'r')
-        CSV = csv.reader(f)
-        next(CSV)
-        for row in CSV:
-            
-            try: 
-                symbol, current_price, opening_price = row
-                self.symbols.append(symbol)
-                self.stock_info[symbol] = [current_price, opening_price]
-            except: 
-                pass # we dont want to include incomplete information 
-                
-        f.close()
-        
-    def readCryptoCSV(self):
-        self.coins = []
-        self.coin_info = {}
-        f = open('csv/crypto.csv', 'r')
-        CSV = csv.reader(f)
-        next(CSV)
-        for row in CSV:
-            
-            try: 
-                symbol, coin, base, current_price, day_change = row
-                self.coins.append(coin)
-                self.coin_info[coin] = [symbol, base, current_price, day_change]
-            except: 
-                pass
-                
-        f.close()
-    
     def readSportsCSV(self, league):
        
         team_info = {}
@@ -2139,6 +2126,8 @@ if __name__ == '__main__':
             stock_ticker = StockTicker()
             
             start_image = Image.open('./logos/startup_logo.png')
+            
+            stock_ticker.updateMultiple(['News'])
             stock_ticker.setImage(start_image)
             time.sleep(1)
             stock_ticker.resetMatrix()