diff --git a/csv/sports/MLS/team_info.csv b/csv/sports/MLS/team_info.csv index d32821b..63bb105 100644 --- a/csv/sports/MLS/team_info.csv +++ b/csv/sports/MLS/team_info.csv @@ -38,3 +38,5 @@ Seattle Sounders FC,134149,SEA,Green,Seattle.png Sporting Kansas City,134143,KC,Blue,Kansas-City.png Toronto FC,134148,TOR,Red,Toronto.png Vancouver Whitecaps,134147,VAN,Blue,Vancouver.png +St. Louis City SC,147062,STL,Red,St-Louis.png +St. Louis CITY SC,147062,STL,Red,St-Louis.png diff --git a/database_caller.py b/database_caller.py index ee9e196..89135cc 100755 --- a/database_caller.py +++ b/database_caller.py @@ -158,7 +158,16 @@ def updateCommodities(api_key, logf): #logf.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2]))) #logf.close() + +def human_format(num): + num = float('{:.3g}'.format(num)) + magnitude = 0 + while abs(num) >= 1000: + magnitude += 1 + num /= 1000.0 + return '{}{}'.format('{:f}'.format(num).rstrip('0').rstrip('.'), ['', 'K', 'M', 'B', 'T'][magnitude]) + def updateMovies(api_key, logf): f = open('csv/movie_settings.json', 'r') @@ -198,6 +207,18 @@ def updateMovies(api_key, logf): movies = data['results'] for movie in movies: + + if movie['media_type'] == 'movie': + movie_id = movie['id'] + box_office_url = 'https://api.themoviedb.org/3/movie/' + str(movie_id) + '?api_key=' + api_key + box_office_response = requests.get(box_office_url) + box_office_data = box_office_response.json() + budget = human_format(box_office_data['budget']) + revenue = human_format(box_office_data['revenue']) + else: + budget = '0' + revenue = '0' + movie_language = movie['original_language'] movie_votes = movie['vote_average'] movie_votes = "{:.1f}".format(movie_votes) @@ -248,13 +269,17 @@ def updateMovies(api_key, logf): 'date':movie_date, 'media_type':movie_type.capitalize(), 'genre':genrefinal, + 'budget':budget, + 'revenue':revenue, 'backdrop':movie['backdrop_path'][1:], 'logo': movie_logo }) logo_files.append(movie['backdrop_path'][1:]) - urllib.request.urlretrieve(movie_logo,'logos/movies/' + movie['backdrop_path']) + if movie['backdrop_path'][1:] not in os.listdir('logos/movies/'): + urllib.request.urlretrieve(movie_logo,'logos/movies/' + movie['backdrop_path']) + time.sleep(0.5) for file in os.listdir('logos/movies/'): if file not in logo_files: diff --git a/feature_titles/earnings.png b/feature_titles/earnings.png new file mode 100644 index 0000000..32b267e Binary files /dev/null and b/feature_titles/earnings.png differ diff --git a/logos/earnings/2-star.png b/logos/earnings/2-star.png new file mode 100644 index 0000000..ae2d3bd Binary files /dev/null and b/logos/earnings/2-star.png differ diff --git a/logos/earnings/3-star.png b/logos/earnings/3-star.png new file mode 100644 index 0000000..f2f59ac Binary files /dev/null and b/logos/earnings/3-star.png differ diff --git a/logos/earnings/4-star.png b/logos/earnings/4-star.png new file mode 100644 index 0000000..b9dcbca Binary files /dev/null and b/logos/earnings/4-star.png differ diff --git a/logos/earnings/5-star.png b/logos/earnings/5-star.png new file mode 100644 index 0000000..387d9c7 Binary files /dev/null and b/logos/earnings/5-star.png differ diff --git a/logos/earnings/star.png b/logos/earnings/star.png new file mode 100644 index 0000000..5b9bac7 Binary files /dev/null and b/logos/earnings/star.png differ diff --git a/logos/news_logos/1news.png b/logos/news_logos/1news.png new file mode 100644 index 0000000..75f135f Binary files /dev/null and b/logos/news_logos/1news.png differ diff --git a/logos/news_logos/247sports.png b/logos/news_logos/247sports.png new file mode 100644 index 0000000..11dd450 Binary files /dev/null and b/logos/news_logos/247sports.png differ diff --git a/logos/news_logos/7news.png b/logos/news_logos/7news.png new file mode 100644 index 0000000..b292d9e Binary files /dev/null and b/logos/news_logos/7news.png differ diff --git a/logos/news_logos/9news.com-kusa.png b/logos/news_logos/9news.com-kusa.png new file mode 100644 index 0000000..1127f25 Binary files /dev/null and b/logos/news_logos/9news.com-kusa.png differ diff --git a/logos/news_logos/9to5google.png b/logos/news_logos/9to5google.png new file mode 100644 index 0000000..c4814d9 Binary files /dev/null and b/logos/news_logos/9to5google.png differ diff --git a/logos/news_logos/bbc.png b/logos/news_logos/bbc.png new file mode 100644 index 0000000..2e664bc Binary files /dev/null and b/logos/news_logos/bbc.png differ diff --git a/logos/news_logos/bloomberg-technology.png b/logos/news_logos/bloomberg-technology.png new file mode 100644 index 0000000..0791d2b Binary files /dev/null and b/logos/news_logos/bloomberg-technology.png differ diff --git a/logos/news_logos/bloomberg-television.png b/logos/news_logos/bloomberg-television.png new file mode 100644 index 0000000..0791d2b Binary files /dev/null and b/logos/news_logos/bloomberg-television.png differ diff --git a/logos/news_logos/breitbart.png b/logos/news_logos/breitbart.png new file mode 100644 index 0000000..80b4f5b Binary files /dev/null and b/logos/news_logos/breitbart.png differ diff --git a/logos/news_logos/brisbane-times.png b/logos/news_logos/brisbane-times.png new file mode 100644 index 0000000..19979af Binary files /dev/null and b/logos/news_logos/brisbane-times.png differ diff --git a/logos/news_logos/business-wire.png b/logos/news_logos/business-wire.png new file mode 100644 index 0000000..c3e3fa9 Binary files /dev/null and b/logos/news_logos/business-wire.png differ diff --git a/logos/news_logos/buzzfeed-news.png b/logos/news_logos/buzzfeed-news.png new file mode 100644 index 0000000..8436f1e Binary files /dev/null and b/logos/news_logos/buzzfeed-news.png differ diff --git a/logos/news_logos/cbc.ca.png b/logos/news_logos/cbc.ca.png new file mode 100644 index 0000000..4a1e842 Binary files /dev/null and b/logos/news_logos/cbc.ca.png differ diff --git a/logos/news_logos/chek-news.png b/logos/news_logos/chek-news.png new file mode 100644 index 0000000..1f15b32 Binary files /dev/null and b/logos/news_logos/chek-news.png differ diff --git a/logos/news_logos/chicago-sun-times.png b/logos/news_logos/chicago-sun-times.png new file mode 100644 index 0000000..961d5dd Binary files /dev/null and b/logos/news_logos/chicago-sun-times.png differ diff --git a/logos/news_logos/cnbc-television.png b/logos/news_logos/cnbc-television.png new file mode 100644 index 0000000..e0110e1 Binary files /dev/null and b/logos/news_logos/cnbc-television.png differ diff --git a/logos/news_logos/cointelegraph.png b/logos/news_logos/cointelegraph.png new file mode 100644 index 0000000..864c4d6 Binary files /dev/null and b/logos/news_logos/cointelegraph.png differ diff --git a/logos/news_logos/comicbook.com.png b/logos/news_logos/comicbook.com.png new file mode 100644 index 0000000..eb9a7c9 Binary files /dev/null and b/logos/news_logos/comicbook.com.png differ diff --git a/logos/news_logos/cp24.png b/logos/news_logos/cp24.png new file mode 100644 index 0000000..7028d25 Binary files /dev/null and b/logos/news_logos/cp24.png differ diff --git a/logos/news_logos/ctv-news-atlantic.png b/logos/news_logos/ctv-news-atlantic.png new file mode 100644 index 0000000..6999f49 Binary files /dev/null and b/logos/news_logos/ctv-news-atlantic.png differ diff --git a/logos/news_logos/ctv-news-vancouver.png b/logos/news_logos/ctv-news-vancouver.png new file mode 100644 index 0000000..6999f49 Binary files /dev/null and b/logos/news_logos/ctv-news-vancouver.png differ diff --git a/logos/news_logos/ctv-news.png b/logos/news_logos/ctv-news.png new file mode 100644 index 0000000..6999f49 Binary files /dev/null and b/logos/news_logos/ctv-news.png differ diff --git a/logos/news_logos/daily-record.png b/logos/news_logos/daily-record.png new file mode 100644 index 0000000..58faea3 Binary files /dev/null and b/logos/news_logos/daily-record.png differ diff --git a/logos/news_logos/deadline.png b/logos/news_logos/deadline.png new file mode 100644 index 0000000..923a151 Binary files /dev/null and b/logos/news_logos/deadline.png differ diff --git a/logos/news_logos/dexerto.png b/logos/news_logos/dexerto.png new file mode 100644 index 0000000..386328a Binary files /dev/null and b/logos/news_logos/dexerto.png differ diff --git a/logos/news_logos/droid-life.png b/logos/news_logos/droid-life.png new file mode 100644 index 0000000..512128d Binary files /dev/null and b/logos/news_logos/droid-life.png differ diff --git a/logos/news_logos/dw-(english).png b/logos/news_logos/dw-(english).png new file mode 100644 index 0000000..6ac6380 Binary files /dev/null and b/logos/news_logos/dw-(english).png differ diff --git a/logos/news_logos/elle.png b/logos/news_logos/elle.png new file mode 100644 index 0000000..6131213 Binary files /dev/null and b/logos/news_logos/elle.png differ diff --git a/logos/news_logos/entertainment-tonight.png b/logos/news_logos/entertainment-tonight.png new file mode 100644 index 0000000..65665a7 Binary files /dev/null and b/logos/news_logos/entertainment-tonight.png differ diff --git a/logos/news_logos/entertainment-weekly-news.png b/logos/news_logos/entertainment-weekly-news.png new file mode 100644 index 0000000..56026dd Binary files /dev/null and b/logos/news_logos/entertainment-weekly-news.png differ diff --git a/logos/news_logos/euronews.png b/logos/news_logos/euronews.png new file mode 100644 index 0000000..2aee6de Binary files /dev/null and b/logos/news_logos/euronews.png differ diff --git a/logos/news_logos/fox-4-news-dallas-fort-worth.png b/logos/news_logos/fox-4-news-dallas-fort-worth.png new file mode 100644 index 0000000..fd62e31 Binary files /dev/null and b/logos/news_logos/fox-4-news-dallas-fort-worth.png differ diff --git a/logos/news_logos/france-24-english.png b/logos/news_logos/france-24-english.png new file mode 100644 index 0000000..8234239 Binary files /dev/null and b/logos/news_logos/france-24-english.png differ diff --git a/logos/news_logos/gizmodo.png b/logos/news_logos/gizmodo.png new file mode 100644 index 0000000..5389ef3 Binary files /dev/null and b/logos/news_logos/gizmodo.png differ diff --git a/logos/news_logos/gloucestershire-live.png b/logos/news_logos/gloucestershire-live.png new file mode 100644 index 0000000..20f8438 Binary files /dev/null and b/logos/news_logos/gloucestershire-live.png differ diff --git a/logos/news_logos/gma-news-online.png b/logos/news_logos/gma-news-online.png new file mode 100644 index 0000000..08f7fbd Binary files /dev/null and b/logos/news_logos/gma-news-online.png differ diff --git a/logos/news_logos/gma.png b/logos/news_logos/gma.png new file mode 100644 index 0000000..61d43d0 Binary files /dev/null and b/logos/news_logos/gma.png differ diff --git a/logos/news_logos/health.png b/logos/news_logos/health.png new file mode 100644 index 0000000..53b287b Binary files /dev/null and b/logos/news_logos/health.png differ diff --git a/logos/news_logos/huffpost-uk.png b/logos/news_logos/huffpost-uk.png new file mode 100644 index 0000000..1e207a9 Binary files /dev/null and b/logos/news_logos/huffpost-uk.png differ diff --git a/logos/news_logos/indiatimes.com.png b/logos/news_logos/indiatimes.com.png new file mode 100644 index 0000000..1bdd2a6 Binary files /dev/null and b/logos/news_logos/indiatimes.com.png differ diff --git a/logos/news_logos/inside-edition.png b/logos/news_logos/inside-edition.png new file mode 100644 index 0000000..bb0ef3d Binary files /dev/null and b/logos/news_logos/inside-edition.png differ diff --git a/logos/news_logos/insider.png b/logos/news_logos/insider.png new file mode 100644 index 0000000..01d629e Binary files /dev/null and b/logos/news_logos/insider.png differ diff --git a/logos/news_logos/irish-mirror.png b/logos/news_logos/irish-mirror.png new file mode 100644 index 0000000..d0d73cc Binary files /dev/null and b/logos/news_logos/irish-mirror.png differ diff --git a/logos/news_logos/kabc-tv.png b/logos/news_logos/kabc-tv.png new file mode 100644 index 0000000..956fc74 Binary files /dev/null and b/logos/news_logos/kabc-tv.png differ diff --git a/logos/news_logos/kfox-el-paso.png b/logos/news_logos/kfox-el-paso.png new file mode 100644 index 0000000..fd55f21 Binary files /dev/null and b/logos/news_logos/kfox-el-paso.png differ diff --git a/logos/news_logos/komo-news.png b/logos/news_logos/komo-news.png new file mode 100644 index 0000000..d16faa8 Binary files /dev/null and b/logos/news_logos/komo-news.png differ diff --git a/logos/news_logos/ksnb.png b/logos/news_logos/ksnb.png new file mode 100644 index 0000000..e7dcd9c Binary files /dev/null and b/logos/news_logos/ksnb.png differ diff --git a/logos/news_logos/ktla-los-angeles.png b/logos/news_logos/ktla-los-angeles.png new file mode 100644 index 0000000..457b6f1 Binary files /dev/null and b/logos/news_logos/ktla-los-angeles.png differ diff --git a/logos/news_logos/kut.png b/logos/news_logos/kut.png new file mode 100644 index 0000000..ef9072f Binary files /dev/null and b/logos/news_logos/kut.png differ diff --git a/logos/news_logos/ladbible.png b/logos/news_logos/ladbible.png new file mode 100644 index 0000000..82430c5 Binary files /dev/null and b/logos/news_logos/ladbible.png differ diff --git a/logos/news_logos/lifehacker.png b/logos/news_logos/lifehacker.png new file mode 100644 index 0000000..6d0adff Binary files /dev/null and b/logos/news_logos/lifehacker.png differ diff --git a/logos/news_logos/livescience.com.png b/logos/news_logos/livescience.com.png new file mode 100644 index 0000000..43faca2 Binary files /dev/null and b/logos/news_logos/livescience.com.png differ diff --git a/logos/news_logos/los-angeles-times.png b/logos/news_logos/los-angeles-times.png new file mode 100644 index 0000000..11cf395 Binary files /dev/null and b/logos/news_logos/los-angeles-times.png differ diff --git a/logos/news_logos/men's-health.png b/logos/news_logos/men's-health.png new file mode 100644 index 0000000..b32c4f0 Binary files /dev/null and b/logos/news_logos/men's-health.png differ diff --git a/logos/news_logos/miami-herald.png b/logos/news_logos/miami-herald.png new file mode 100644 index 0000000..231fdd5 Binary files /dev/null and b/logos/news_logos/miami-herald.png differ diff --git a/logos/news_logos/msnnow.png b/logos/news_logos/msnnow.png new file mode 100644 index 0000000..bfa492d Binary files /dev/null and b/logos/news_logos/msnnow.png differ diff --git a/logos/news_logos/mtv.png b/logos/news_logos/mtv.png new file mode 100644 index 0000000..3995892 Binary files /dev/null and b/logos/news_logos/mtv.png differ diff --git a/logos/news_logos/nature.com.png b/logos/news_logos/nature.com.png new file mode 100644 index 0000000..87686ac Binary files /dev/null and b/logos/news_logos/nature.com.png differ diff --git a/logos/news_logos/nbc-chicago.png b/logos/news_logos/nbc-chicago.png new file mode 100644 index 0000000..df1969e Binary files /dev/null and b/logos/news_logos/nbc-chicago.png differ diff --git a/logos/news_logos/nbc-sports-boston.png b/logos/news_logos/nbc-sports-boston.png new file mode 100644 index 0000000..66b0fb7 Binary files /dev/null and b/logos/news_logos/nbc-sports-boston.png differ diff --git a/logos/news_logos/nbc-sports.png b/logos/news_logos/nbc-sports.png new file mode 100644 index 0000000..66b0fb7 Binary files /dev/null and b/logos/news_logos/nbc-sports.png differ diff --git a/logos/news_logos/ndtv.png b/logos/news_logos/ndtv.png new file mode 100644 index 0000000..c66f4c0 Binary files /dev/null and b/logos/news_logos/ndtv.png differ diff --git a/logos/news_logos/new-york-post-.png b/logos/news_logos/new-york-post-.png new file mode 100644 index 0000000..8525674 Binary files /dev/null and b/logos/news_logos/new-york-post-.png differ diff --git a/logos/news_logos/newshub.png b/logos/news_logos/newshub.png new file mode 100644 index 0000000..471f6b7 Binary files /dev/null and b/logos/news_logos/newshub.png differ diff --git a/logos/news_logos/newsmax.png b/logos/news_logos/newsmax.png new file mode 100644 index 0000000..49354f7 Binary files /dev/null and b/logos/news_logos/newsmax.png differ diff --git a/logos/news_logos/nfl.com.png b/logos/news_logos/nfl.com.png new file mode 100644 index 0000000..6a8dcb5 Binary files /dev/null and b/logos/news_logos/nfl.com.png differ diff --git a/logos/news_logos/nhl.com.png b/logos/news_logos/nhl.com.png new file mode 100644 index 0000000..33bc6a0 Binary files /dev/null and b/logos/news_logos/nhl.com.png differ diff --git a/logos/news_logos/nme.png b/logos/news_logos/nme.png new file mode 100644 index 0000000..0a2b21d Binary files /dev/null and b/logos/news_logos/nme.png differ diff --git a/logos/news_logos/oregonlive.png b/logos/news_logos/oregonlive.png new file mode 100644 index 0000000..59c1cc7 Binary files /dev/null and b/logos/news_logos/oregonlive.png differ diff --git a/logos/news_logos/pcmag.png b/logos/news_logos/pcmag.png new file mode 100644 index 0000000..aaadefc Binary files /dev/null and b/logos/news_logos/pcmag.png differ diff --git a/logos/news_logos/perthnow.png b/logos/news_logos/perthnow.png new file mode 100644 index 0000000..d6df44a Binary files /dev/null and b/logos/news_logos/perthnow.png differ diff --git a/logos/news_logos/politico-europe.png b/logos/news_logos/politico-europe.png new file mode 100644 index 0000000..adf12fc Binary files /dev/null and b/logos/news_logos/politico-europe.png differ diff --git a/logos/news_logos/pr-newswire.png b/logos/news_logos/pr-newswire.png new file mode 100644 index 0000000..c8be13f Binary files /dev/null and b/logos/news_logos/pr-newswire.png differ diff --git a/logos/news_logos/reuters-india.png b/logos/news_logos/reuters-india.png new file mode 100644 index 0000000..06fbbc1 Binary files /dev/null and b/logos/news_logos/reuters-india.png differ diff --git a/logos/news_logos/reuters.com.png b/logos/news_logos/reuters.com.png new file mode 100644 index 0000000..06fbbc1 Binary files /dev/null and b/logos/news_logos/reuters.com.png differ diff --git a/logos/news_logos/rnz.png b/logos/news_logos/rnz.png new file mode 100644 index 0000000..d7da0ae Binary files /dev/null and b/logos/news_logos/rnz.png differ diff --git a/logos/news_logos/rte.ie.png b/logos/news_logos/rte.ie.png new file mode 100644 index 0000000..c7c1f4e Binary files /dev/null and b/logos/news_logos/rte.ie.png differ diff --git a/logos/news_logos/sciencealert.png b/logos/news_logos/sciencealert.png new file mode 100644 index 0000000..8fab708 Binary files /dev/null and b/logos/news_logos/sciencealert.png differ diff --git a/logos/news_logos/sky-news-australia.png b/logos/news_logos/sky-news-australia.png new file mode 100644 index 0000000..6d8b1a0 Binary files /dev/null and b/logos/news_logos/sky-news-australia.png differ diff --git a/logos/news_logos/sky-news.png b/logos/news_logos/sky-news.png new file mode 100644 index 0000000..6d8b1a0 Binary files /dev/null and b/logos/news_logos/sky-news.png differ diff --git a/logos/news_logos/south-china-morning-post.png b/logos/news_logos/south-china-morning-post.png new file mode 100644 index 0000000..d05d94c Binary files /dev/null and b/logos/news_logos/south-china-morning-post.png differ diff --git a/logos/news_logos/space.com.png b/logos/news_logos/space.com.png new file mode 100644 index 0000000..dcbed46 Binary files /dev/null and b/logos/news_logos/space.com.png differ diff --git a/logos/news_logos/sportbible.png b/logos/news_logos/sportbible.png new file mode 100644 index 0000000..f8962af Binary files /dev/null and b/logos/news_logos/sportbible.png differ diff --git a/logos/news_logos/stuff.png b/logos/news_logos/stuff.png new file mode 100644 index 0000000..e7595cd Binary files /dev/null and b/logos/news_logos/stuff.png differ diff --git a/logos/news_logos/sydney-morning-herald.png b/logos/news_logos/sydney-morning-herald.png new file mode 100644 index 0000000..6dd997c Binary files /dev/null and b/logos/news_logos/sydney-morning-herald.png differ diff --git a/logos/news_logos/the-associated-press---en-español.png b/logos/news_logos/the-associated-press---en-español.png new file mode 100644 index 0000000..14fbea2 Binary files /dev/null and b/logos/news_logos/the-associated-press---en-español.png differ diff --git a/logos/news_logos/the-associated-press.png b/logos/news_logos/the-associated-press.png new file mode 100644 index 0000000..14fbea2 Binary files /dev/null and b/logos/news_logos/the-associated-press.png differ diff --git a/logos/news_logos/the-australian-financial-review.png b/logos/news_logos/the-australian-financial-review.png new file mode 100644 index 0000000..5ddbe9b Binary files /dev/null and b/logos/news_logos/the-australian-financial-review.png differ diff --git a/logos/news_logos/the-boston-globe.png b/logos/news_logos/the-boston-globe.png new file mode 100644 index 0000000..4b8d2e4 Binary files /dev/null and b/logos/news_logos/the-boston-globe.png differ diff --git a/logos/news_logos/the-business-times.png b/logos/news_logos/the-business-times.png new file mode 100644 index 0000000..4ae0b9c Binary files /dev/null and b/logos/news_logos/the-business-times.png differ diff --git a/logos/news_logos/the-conversation.png b/logos/news_logos/the-conversation.png new file mode 100644 index 0000000..f4f0190 Binary files /dev/null and b/logos/news_logos/the-conversation.png differ diff --git a/logos/news_logos/the-daily-beast.png b/logos/news_logos/the-daily-beast.png new file mode 100644 index 0000000..854bcac Binary files /dev/null and b/logos/news_logos/the-daily-beast.png differ diff --git a/logos/news_logos/the-hacker-news.png b/logos/news_logos/the-hacker-news.png new file mode 100644 index 0000000..70ae2d2 Binary files /dev/null and b/logos/news_logos/the-hacker-news.png differ diff --git a/logos/news_logos/the-hollywood-reporter.png b/logos/news_logos/the-hollywood-reporter.png new file mode 100644 index 0000000..edf756e Binary files /dev/null and b/logos/news_logos/the-hollywood-reporter.png differ diff --git a/logos/news_logos/the-independent.png b/logos/news_logos/the-independent.png new file mode 100644 index 0000000..0333c8a Binary files /dev/null and b/logos/news_logos/the-independent.png differ diff --git a/logos/news_logos/the-indian-express.png b/logos/news_logos/the-indian-express.png new file mode 100644 index 0000000..9e5cd2c Binary files /dev/null and b/logos/news_logos/the-indian-express.png differ diff --git a/logos/news_logos/the-japan-times.png b/logos/news_logos/the-japan-times.png new file mode 100644 index 0000000..b7a69ec Binary files /dev/null and b/logos/news_logos/the-japan-times.png differ diff --git a/logos/news_logos/the-mirror.png b/logos/news_logos/the-mirror.png new file mode 100644 index 0000000..d0d73cc Binary files /dev/null and b/logos/news_logos/the-mirror.png differ diff --git a/logos/news_logos/the-moscow-times.png b/logos/news_logos/the-moscow-times.png new file mode 100644 index 0000000..3984b54 Binary files /dev/null and b/logos/news_logos/the-moscow-times.png differ diff --git a/logos/news_logos/the-motley-fool-australia.png b/logos/news_logos/the-motley-fool-australia.png new file mode 100644 index 0000000..d59927f Binary files /dev/null and b/logos/news_logos/the-motley-fool-australia.png differ diff --git a/logos/news_logos/the-motley-fool.png b/logos/news_logos/the-motley-fool.png new file mode 100644 index 0000000..d59927f Binary files /dev/null and b/logos/news_logos/the-motley-fool.png differ diff --git a/logos/news_logos/the-new-york-times.png b/logos/news_logos/the-new-york-times.png new file mode 100644 index 0000000..118c696 Binary files /dev/null and b/logos/news_logos/the-new-york-times.png differ diff --git a/logos/news_logos/the-register.png b/logos/news_logos/the-register.png new file mode 100644 index 0000000..08f75c6 Binary files /dev/null and b/logos/news_logos/the-register.png differ diff --git a/logos/news_logos/the-seattle-times.png b/logos/news_logos/the-seattle-times.png new file mode 100644 index 0000000..a75d1fe Binary files /dev/null and b/logos/news_logos/the-seattle-times.png differ diff --git a/logos/news_logos/the-telegraph.png b/logos/news_logos/the-telegraph.png new file mode 100644 index 0000000..9dbb8ca Binary files /dev/null and b/logos/news_logos/the-telegraph.png differ diff --git a/logos/news_logos/the-times-of-israel.png b/logos/news_logos/the-times-of-israel.png new file mode 100644 index 0000000..ffef7dd Binary files /dev/null and b/logos/news_logos/the-times-of-israel.png differ diff --git a/logos/news_logos/the-us-sun.png b/logos/news_logos/the-us-sun.png new file mode 100644 index 0000000..7dbf536 Binary files /dev/null and b/logos/news_logos/the-us-sun.png differ diff --git a/logos/news_logos/the-weather-channel.png b/logos/news_logos/the-weather-channel.png new file mode 100644 index 0000000..a426995 Binary files /dev/null and b/logos/news_logos/the-weather-channel.png differ diff --git a/logos/news_logos/times-of-india.png b/logos/news_logos/times-of-india.png new file mode 100644 index 0000000..5a29b72 Binary files /dev/null and b/logos/news_logos/times-of-india.png differ diff --git a/logos/news_logos/tnw.png b/logos/news_logos/tnw.png new file mode 100644 index 0000000..3ef2b07 Binary files /dev/null and b/logos/news_logos/tnw.png differ diff --git a/logos/news_logos/tvline.png b/logos/news_logos/tvline.png new file mode 100644 index 0000000..6159093 Binary files /dev/null and b/logos/news_logos/tvline.png differ diff --git a/logos/news_logos/variety.png b/logos/news_logos/variety.png new file mode 100644 index 0000000..18f2ce0 Binary files /dev/null and b/logos/news_logos/variety.png differ diff --git a/logos/news_logos/vice.png b/logos/news_logos/vice.png new file mode 100644 index 0000000..1c3ac8e Binary files /dev/null and b/logos/news_logos/vice.png differ diff --git a/logos/news_logos/vox.com.png b/logos/news_logos/vox.com.png new file mode 100644 index 0000000..a72becc Binary files /dev/null and b/logos/news_logos/vox.com.png differ diff --git a/logos/news_logos/vulture.png b/logos/news_logos/vulture.png new file mode 100644 index 0000000..47f4c48 Binary files /dev/null and b/logos/news_logos/vulture.png differ diff --git a/logos/news_logos/washington-times.png b/logos/news_logos/washington-times.png new file mode 100644 index 0000000..1fba928 Binary files /dev/null and b/logos/news_logos/washington-times.png differ diff --git a/logos/news_logos/wfla.png b/logos/news_logos/wfla.png new file mode 100644 index 0000000..40d1a74 Binary files /dev/null and b/logos/news_logos/wfla.png differ diff --git a/logos/news_logos/wgrz.com.png b/logos/news_logos/wgrz.com.png new file mode 100644 index 0000000..aba4f44 Binary files /dev/null and b/logos/news_logos/wgrz.com.png differ diff --git a/logos/news_logos/wired.co.uk.png b/logos/news_logos/wired.co.uk.png new file mode 100644 index 0000000..6bf610d Binary files /dev/null and b/logos/news_logos/wired.co.uk.png differ diff --git a/logos/news_logos/wjw-fox-8-news-cleveland.png b/logos/news_logos/wjw-fox-8-news-cleveland.png new file mode 100644 index 0000000..c49bb9b Binary files /dev/null and b/logos/news_logos/wjw-fox-8-news-cleveland.png differ diff --git a/logos/news_logos/wjxt-news4jax-.png b/logos/news_logos/wjxt-news4jax-.png new file mode 100644 index 0000000..956317b Binary files /dev/null and b/logos/news_logos/wjxt-news4jax-.png differ diff --git a/logos/news_logos/wkrn-news-2.png b/logos/news_logos/wkrn-news-2.png new file mode 100644 index 0000000..83b3746 Binary files /dev/null and b/logos/news_logos/wkrn-news-2.png differ diff --git a/logos/news_logos/wkyt.png b/logos/news_logos/wkyt.png new file mode 100644 index 0000000..921b5d1 Binary files /dev/null and b/logos/news_logos/wkyt.png differ diff --git a/logos/news_logos/wsoc-charlotte.png b/logos/news_logos/wsoc-charlotte.png new file mode 100644 index 0000000..21c96a1 Binary files /dev/null and b/logos/news_logos/wsoc-charlotte.png differ diff --git a/logos/news_logos/wtvc.png b/logos/news_logos/wtvc.png new file mode 100644 index 0000000..ccc2f44 Binary files /dev/null and b/logos/news_logos/wtvc.png differ diff --git a/logos/news_logos/wwlp.com.png b/logos/news_logos/wwlp.com.png new file mode 100644 index 0000000..ce64857 Binary files /dev/null and b/logos/news_logos/wwlp.com.png differ diff --git a/logos/news_logos/wwmt-tv.png b/logos/news_logos/wwmt-tv.png new file mode 100644 index 0000000..0c66bc7 Binary files /dev/null and b/logos/news_logos/wwmt-tv.png differ diff --git a/logos/news_logos/yahoo!-voices.png b/logos/news_logos/yahoo!-voices.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo!-voices.png differ diff --git a/logos/news_logos/yahoo-canada-finance.png b/logos/news_logos/yahoo-canada-finance.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-canada-finance.png differ diff --git a/logos/news_logos/yahoo-canada.png b/logos/news_logos/yahoo-canada.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-canada.png differ diff --git a/logos/news_logos/yahoo-finance.png b/logos/news_logos/yahoo-finance.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-finance.png differ diff --git a/logos/news_logos/yahoo-life.png b/logos/news_logos/yahoo-life.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-life.png differ diff --git a/logos/news_logos/yahoo-news.png b/logos/news_logos/yahoo-news.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-news.png differ diff --git a/logos/news_logos/yahoo-sports.png b/logos/news_logos/yahoo-sports.png new file mode 100644 index 0000000..f0732a2 Binary files /dev/null and b/logos/news_logos/yahoo-sports.png differ diff --git a/logos/sports/MLS/St-Louis.png b/logos/sports/MLS/St-Louis.png new file mode 100644 index 0000000..74055bc Binary files /dev/null and b/logos/sports/MLS/St-Louis.png differ diff --git a/logos/tiny_news/1news.png b/logos/tiny_news/1news.png new file mode 100644 index 0000000..23b7cff Binary files /dev/null and b/logos/tiny_news/1news.png differ diff --git a/logos/tiny_news/247sports.png b/logos/tiny_news/247sports.png new file mode 100644 index 0000000..891c326 Binary files /dev/null and b/logos/tiny_news/247sports.png differ diff --git a/logos/tiny_news/7news.png b/logos/tiny_news/7news.png new file mode 100644 index 0000000..6447b3c Binary files /dev/null and b/logos/tiny_news/7news.png differ diff --git a/logos/tiny_news/9news.com-kusa.png b/logos/tiny_news/9news.com-kusa.png new file mode 100644 index 0000000..cfc52df Binary files /dev/null and b/logos/tiny_news/9news.com-kusa.png differ diff --git a/logos/tiny_news/9to5google.png b/logos/tiny_news/9to5google.png new file mode 100644 index 0000000..74356cd Binary files /dev/null and b/logos/tiny_news/9to5google.png differ diff --git a/logos/tiny_news/bbc.png b/logos/tiny_news/bbc.png new file mode 100644 index 0000000..66ad1fa Binary files /dev/null and b/logos/tiny_news/bbc.png differ diff --git a/logos/tiny_news/bloomberg-technology.png b/logos/tiny_news/bloomberg-technology.png new file mode 100644 index 0000000..c4f5068 Binary files /dev/null and b/logos/tiny_news/bloomberg-technology.png differ diff --git a/logos/tiny_news/bloomberg-television.png b/logos/tiny_news/bloomberg-television.png new file mode 100644 index 0000000..c4f5068 Binary files /dev/null and b/logos/tiny_news/bloomberg-television.png differ diff --git a/logos/tiny_news/breitbart.png b/logos/tiny_news/breitbart.png new file mode 100644 index 0000000..0033384 Binary files /dev/null and b/logos/tiny_news/breitbart.png differ diff --git a/logos/tiny_news/brisbane-times.png b/logos/tiny_news/brisbane-times.png new file mode 100644 index 0000000..c4bec7e Binary files /dev/null and b/logos/tiny_news/brisbane-times.png differ diff --git a/logos/tiny_news/business-wire.png b/logos/tiny_news/business-wire.png new file mode 100644 index 0000000..99aa0d0 Binary files /dev/null and b/logos/tiny_news/business-wire.png differ diff --git a/logos/tiny_news/buzzfeed-news.png b/logos/tiny_news/buzzfeed-news.png new file mode 100644 index 0000000..25afc08 Binary files /dev/null and b/logos/tiny_news/buzzfeed-news.png differ diff --git a/logos/tiny_news/cbc.ca.png b/logos/tiny_news/cbc.ca.png new file mode 100644 index 0000000..98c7daf Binary files /dev/null and b/logos/tiny_news/cbc.ca.png differ diff --git a/logos/tiny_news/chek-news.png b/logos/tiny_news/chek-news.png new file mode 100644 index 0000000..b1701b6 Binary files /dev/null and b/logos/tiny_news/chek-news.png differ diff --git a/logos/tiny_news/chicago-sun-times.png b/logos/tiny_news/chicago-sun-times.png new file mode 100644 index 0000000..17f58b3 Binary files /dev/null and b/logos/tiny_news/chicago-sun-times.png differ diff --git a/logos/tiny_news/cnbc-television.png b/logos/tiny_news/cnbc-television.png new file mode 100644 index 0000000..38b439a Binary files /dev/null and b/logos/tiny_news/cnbc-television.png differ diff --git a/logos/tiny_news/cointelegraph.png b/logos/tiny_news/cointelegraph.png new file mode 100644 index 0000000..13e68bd Binary files /dev/null and b/logos/tiny_news/cointelegraph.png differ diff --git a/logos/tiny_news/comicbook.com.png b/logos/tiny_news/comicbook.com.png new file mode 100644 index 0000000..ed8da6f Binary files /dev/null and b/logos/tiny_news/comicbook.com.png differ diff --git a/logos/tiny_news/cp24.png b/logos/tiny_news/cp24.png new file mode 100644 index 0000000..89c2b69 Binary files /dev/null and b/logos/tiny_news/cp24.png differ diff --git a/logos/tiny_news/ctv-news-atlantic.png b/logos/tiny_news/ctv-news-atlantic.png new file mode 100644 index 0000000..321e77d Binary files /dev/null and b/logos/tiny_news/ctv-news-atlantic.png differ diff --git a/logos/tiny_news/ctv-news-vancouver.png b/logos/tiny_news/ctv-news-vancouver.png new file mode 100644 index 0000000..321e77d Binary files /dev/null and b/logos/tiny_news/ctv-news-vancouver.png differ diff --git a/logos/tiny_news/ctv-news.png b/logos/tiny_news/ctv-news.png new file mode 100644 index 0000000..321e77d Binary files /dev/null and b/logos/tiny_news/ctv-news.png differ diff --git a/logos/tiny_news/daily-record.png b/logos/tiny_news/daily-record.png new file mode 100644 index 0000000..1b1c22d Binary files /dev/null and b/logos/tiny_news/daily-record.png differ diff --git a/logos/tiny_news/deadline.png b/logos/tiny_news/deadline.png new file mode 100644 index 0000000..16d2f10 Binary files /dev/null and b/logos/tiny_news/deadline.png differ diff --git a/logos/tiny_news/dexerto.png b/logos/tiny_news/dexerto.png new file mode 100644 index 0000000..41913b3 Binary files /dev/null and b/logos/tiny_news/dexerto.png differ diff --git a/logos/tiny_news/droid-life.png b/logos/tiny_news/droid-life.png new file mode 100644 index 0000000..06976d9 Binary files /dev/null and b/logos/tiny_news/droid-life.png differ diff --git a/logos/tiny_news/dw-(english).png b/logos/tiny_news/dw-(english).png new file mode 100644 index 0000000..2098e6e Binary files /dev/null and b/logos/tiny_news/dw-(english).png differ diff --git a/logos/tiny_news/elle.png b/logos/tiny_news/elle.png new file mode 100644 index 0000000..092e6de Binary files /dev/null and b/logos/tiny_news/elle.png differ diff --git a/logos/tiny_news/entertainment-tonight.png b/logos/tiny_news/entertainment-tonight.png new file mode 100644 index 0000000..1034ff3 Binary files /dev/null and b/logos/tiny_news/entertainment-tonight.png differ diff --git a/logos/tiny_news/entertainment-weekly-news.png b/logos/tiny_news/entertainment-weekly-news.png new file mode 100644 index 0000000..5b38c41 Binary files /dev/null and b/logos/tiny_news/entertainment-weekly-news.png differ diff --git a/logos/tiny_news/euronews.png b/logos/tiny_news/euronews.png new file mode 100644 index 0000000..b69c7ef Binary files /dev/null and b/logos/tiny_news/euronews.png differ diff --git a/logos/tiny_news/fox-4-news-dallas-fort-worth.png b/logos/tiny_news/fox-4-news-dallas-fort-worth.png new file mode 100644 index 0000000..924cff7 Binary files /dev/null and b/logos/tiny_news/fox-4-news-dallas-fort-worth.png differ diff --git a/logos/tiny_news/france-24-english.png b/logos/tiny_news/france-24-english.png new file mode 100644 index 0000000..6692d6c Binary files /dev/null and b/logos/tiny_news/france-24-english.png differ diff --git a/logos/tiny_news/gizmodo.png b/logos/tiny_news/gizmodo.png new file mode 100644 index 0000000..8107c08 Binary files /dev/null and b/logos/tiny_news/gizmodo.png differ diff --git a/logos/tiny_news/gloucestershire-live.png b/logos/tiny_news/gloucestershire-live.png new file mode 100644 index 0000000..85663e3 Binary files /dev/null and b/logos/tiny_news/gloucestershire-live.png differ diff --git a/logos/tiny_news/gma-news-online.png b/logos/tiny_news/gma-news-online.png new file mode 100644 index 0000000..7494043 Binary files /dev/null and b/logos/tiny_news/gma-news-online.png differ diff --git a/logos/tiny_news/gma.png b/logos/tiny_news/gma.png new file mode 100644 index 0000000..fda2506 Binary files /dev/null and b/logos/tiny_news/gma.png differ diff --git a/logos/tiny_news/health.png b/logos/tiny_news/health.png new file mode 100644 index 0000000..38a14ac Binary files /dev/null and b/logos/tiny_news/health.png differ diff --git a/logos/tiny_news/huffpost-uk.png b/logos/tiny_news/huffpost-uk.png new file mode 100644 index 0000000..0c28aa1 Binary files /dev/null and b/logos/tiny_news/huffpost-uk.png differ diff --git a/logos/tiny_news/indiatimes.com.png b/logos/tiny_news/indiatimes.com.png new file mode 100644 index 0000000..2a72588 Binary files /dev/null and b/logos/tiny_news/indiatimes.com.png differ diff --git a/logos/tiny_news/inside-edition.png b/logos/tiny_news/inside-edition.png new file mode 100644 index 0000000..5cfeec3 Binary files /dev/null and b/logos/tiny_news/inside-edition.png differ diff --git a/logos/tiny_news/insider.png b/logos/tiny_news/insider.png new file mode 100644 index 0000000..af35ea8 Binary files /dev/null and b/logos/tiny_news/insider.png differ diff --git a/logos/tiny_news/irish-mirror.png b/logos/tiny_news/irish-mirror.png new file mode 100644 index 0000000..c3fe27b Binary files /dev/null and b/logos/tiny_news/irish-mirror.png differ diff --git a/logos/tiny_news/kabc-tv.png b/logos/tiny_news/kabc-tv.png new file mode 100644 index 0000000..a654deb Binary files /dev/null and b/logos/tiny_news/kabc-tv.png differ diff --git a/logos/tiny_news/kfox-el-paso.png b/logos/tiny_news/kfox-el-paso.png new file mode 100644 index 0000000..d4929b8 Binary files /dev/null and b/logos/tiny_news/kfox-el-paso.png differ diff --git a/logos/tiny_news/komo-news.png b/logos/tiny_news/komo-news.png new file mode 100644 index 0000000..76a4ec2 Binary files /dev/null and b/logos/tiny_news/komo-news.png differ diff --git a/logos/tiny_news/ksnb.png b/logos/tiny_news/ksnb.png new file mode 100644 index 0000000..11ff9a1 Binary files /dev/null and b/logos/tiny_news/ksnb.png differ diff --git a/logos/tiny_news/ktla-los-angeles.png b/logos/tiny_news/ktla-los-angeles.png new file mode 100644 index 0000000..c1d4a97 Binary files /dev/null and b/logos/tiny_news/ktla-los-angeles.png differ diff --git a/logos/tiny_news/kut.png b/logos/tiny_news/kut.png new file mode 100644 index 0000000..72c365c Binary files /dev/null and b/logos/tiny_news/kut.png differ diff --git a/logos/tiny_news/lifehacker.png b/logos/tiny_news/lifehacker.png new file mode 100644 index 0000000..b5c8246 Binary files /dev/null and b/logos/tiny_news/lifehacker.png differ diff --git a/logos/tiny_news/livescience.com.png b/logos/tiny_news/livescience.com.png new file mode 100644 index 0000000..625070e Binary files /dev/null and b/logos/tiny_news/livescience.com.png differ diff --git a/logos/tiny_news/los-angeles-times.png b/logos/tiny_news/los-angeles-times.png new file mode 100644 index 0000000..a1412d7 Binary files /dev/null and b/logos/tiny_news/los-angeles-times.png differ diff --git a/logos/tiny_news/men's-health.png b/logos/tiny_news/men's-health.png new file mode 100644 index 0000000..b8fbb7e Binary files /dev/null and b/logos/tiny_news/men's-health.png differ diff --git a/logos/tiny_news/miami-herald.png b/logos/tiny_news/miami-herald.png new file mode 100644 index 0000000..6fdf4cd Binary files /dev/null and b/logos/tiny_news/miami-herald.png differ diff --git a/logos/tiny_news/msnnow.png b/logos/tiny_news/msnnow.png new file mode 100644 index 0000000..2cf3a94 Binary files /dev/null and b/logos/tiny_news/msnnow.png differ diff --git a/logos/tiny_news/mtv.png b/logos/tiny_news/mtv.png new file mode 100644 index 0000000..db0d035 Binary files /dev/null and b/logos/tiny_news/mtv.png differ diff --git a/logos/tiny_news/nature.com.png b/logos/tiny_news/nature.com.png new file mode 100644 index 0000000..8ff356b Binary files /dev/null and b/logos/tiny_news/nature.com.png differ diff --git a/logos/tiny_news/nbc-chicago.png b/logos/tiny_news/nbc-chicago.png new file mode 100644 index 0000000..6292025 Binary files /dev/null and b/logos/tiny_news/nbc-chicago.png differ diff --git a/logos/tiny_news/nbc-sports-boston.png b/logos/tiny_news/nbc-sports-boston.png new file mode 100644 index 0000000..a745126 Binary files /dev/null and b/logos/tiny_news/nbc-sports-boston.png differ diff --git a/logos/tiny_news/nbc-sports.png b/logos/tiny_news/nbc-sports.png new file mode 100644 index 0000000..a745126 Binary files /dev/null and b/logos/tiny_news/nbc-sports.png differ diff --git a/logos/tiny_news/ndtv.png b/logos/tiny_news/ndtv.png new file mode 100644 index 0000000..f94e663 Binary files /dev/null and b/logos/tiny_news/ndtv.png differ diff --git a/logos/tiny_news/new-york-post-.png b/logos/tiny_news/new-york-post-.png new file mode 100644 index 0000000..5b9ed16 Binary files /dev/null and b/logos/tiny_news/new-york-post-.png differ diff --git a/logos/tiny_news/newshub.png b/logos/tiny_news/newshub.png new file mode 100644 index 0000000..cf2844a Binary files /dev/null and b/logos/tiny_news/newshub.png differ diff --git a/logos/tiny_news/newsmax.png b/logos/tiny_news/newsmax.png new file mode 100644 index 0000000..5cf2435 Binary files /dev/null and b/logos/tiny_news/newsmax.png differ diff --git a/logos/tiny_news/nfl.com.png b/logos/tiny_news/nfl.com.png new file mode 100644 index 0000000..6c368b1 Binary files /dev/null and b/logos/tiny_news/nfl.com.png differ diff --git a/logos/tiny_news/nhl.com.png b/logos/tiny_news/nhl.com.png new file mode 100644 index 0000000..c27fb61 Binary files /dev/null and b/logos/tiny_news/nhl.com.png differ diff --git a/logos/tiny_news/nme.png b/logos/tiny_news/nme.png new file mode 100644 index 0000000..9eed511 Binary files /dev/null and b/logos/tiny_news/nme.png differ diff --git a/logos/tiny_news/oregonlive.png b/logos/tiny_news/oregonlive.png new file mode 100644 index 0000000..eeb79da Binary files /dev/null and b/logos/tiny_news/oregonlive.png differ diff --git a/logos/tiny_news/pcmag.png b/logos/tiny_news/pcmag.png new file mode 100644 index 0000000..52f9863 Binary files /dev/null and b/logos/tiny_news/pcmag.png differ diff --git a/logos/tiny_news/perthnow.png b/logos/tiny_news/perthnow.png new file mode 100644 index 0000000..b97502d Binary files /dev/null and b/logos/tiny_news/perthnow.png differ diff --git a/logos/tiny_news/politico-europe.png b/logos/tiny_news/politico-europe.png new file mode 100644 index 0000000..a81bcf6 Binary files /dev/null and b/logos/tiny_news/politico-europe.png differ diff --git a/logos/tiny_news/pr-newswire.png b/logos/tiny_news/pr-newswire.png new file mode 100644 index 0000000..36be909 Binary files /dev/null and b/logos/tiny_news/pr-newswire.png differ diff --git a/logos/tiny_news/reuters-india.png b/logos/tiny_news/reuters-india.png new file mode 100644 index 0000000..018a855 Binary files /dev/null and b/logos/tiny_news/reuters-india.png differ diff --git a/logos/tiny_news/reuters.com.png b/logos/tiny_news/reuters.com.png new file mode 100644 index 0000000..018a855 Binary files /dev/null and b/logos/tiny_news/reuters.com.png differ diff --git a/logos/tiny_news/rnz.png b/logos/tiny_news/rnz.png new file mode 100644 index 0000000..1afd4ad Binary files /dev/null and b/logos/tiny_news/rnz.png differ diff --git a/logos/tiny_news/rte.ie.png b/logos/tiny_news/rte.ie.png new file mode 100644 index 0000000..5c9b2ab Binary files /dev/null and b/logos/tiny_news/rte.ie.png differ diff --git a/logos/tiny_news/sciencealert.png b/logos/tiny_news/sciencealert.png new file mode 100644 index 0000000..2b6b3e8 Binary files /dev/null and b/logos/tiny_news/sciencealert.png differ diff --git a/logos/tiny_news/sky-news-australia.png b/logos/tiny_news/sky-news-australia.png new file mode 100644 index 0000000..d4b3c9e Binary files /dev/null and b/logos/tiny_news/sky-news-australia.png differ diff --git a/logos/tiny_news/sky-news.png b/logos/tiny_news/sky-news.png new file mode 100644 index 0000000..d4b3c9e Binary files /dev/null and b/logos/tiny_news/sky-news.png differ diff --git a/logos/tiny_news/south-china-morning-post.png b/logos/tiny_news/south-china-morning-post.png new file mode 100644 index 0000000..94747b2 Binary files /dev/null and b/logos/tiny_news/south-china-morning-post.png differ diff --git a/logos/tiny_news/space.com.png b/logos/tiny_news/space.com.png new file mode 100644 index 0000000..4d90585 Binary files /dev/null and b/logos/tiny_news/space.com.png differ diff --git a/logos/tiny_news/sportbible.png b/logos/tiny_news/sportbible.png new file mode 100644 index 0000000..15ba306 Binary files /dev/null and b/logos/tiny_news/sportbible.png differ diff --git a/logos/tiny_news/stuff.png b/logos/tiny_news/stuff.png new file mode 100644 index 0000000..3707314 Binary files /dev/null and b/logos/tiny_news/stuff.png differ diff --git a/logos/tiny_news/sydney-morning-herald.png b/logos/tiny_news/sydney-morning-herald.png new file mode 100644 index 0000000..c4d4ec3 Binary files /dev/null and b/logos/tiny_news/sydney-morning-herald.png differ diff --git a/logos/tiny_news/the-associated-press---en-español.png b/logos/tiny_news/the-associated-press---en-español.png new file mode 100644 index 0000000..9e22327 Binary files /dev/null and b/logos/tiny_news/the-associated-press---en-español.png differ diff --git a/logos/tiny_news/the-associated-press.png b/logos/tiny_news/the-associated-press.png new file mode 100644 index 0000000..9e22327 Binary files /dev/null and b/logos/tiny_news/the-associated-press.png differ diff --git a/logos/tiny_news/the-australian-financial-review.png b/logos/tiny_news/the-australian-financial-review.png new file mode 100644 index 0000000..9ed9a19 Binary files /dev/null and b/logos/tiny_news/the-australian-financial-review.png differ diff --git a/logos/tiny_news/the-boston-globe.png b/logos/tiny_news/the-boston-globe.png new file mode 100644 index 0000000..ea06cd0 Binary files /dev/null and b/logos/tiny_news/the-boston-globe.png differ diff --git a/logos/tiny_news/the-business-times.png b/logos/tiny_news/the-business-times.png new file mode 100644 index 0000000..8b0de86 Binary files /dev/null and b/logos/tiny_news/the-business-times.png differ diff --git a/logos/tiny_news/the-conversation.png b/logos/tiny_news/the-conversation.png new file mode 100644 index 0000000..0ac22e9 Binary files /dev/null and b/logos/tiny_news/the-conversation.png differ diff --git a/logos/tiny_news/the-daily-beast.png b/logos/tiny_news/the-daily-beast.png new file mode 100644 index 0000000..9377d3c Binary files /dev/null and b/logos/tiny_news/the-daily-beast.png differ diff --git a/logos/tiny_news/the-hacker-news.png b/logos/tiny_news/the-hacker-news.png new file mode 100644 index 0000000..4d5b50f Binary files /dev/null and b/logos/tiny_news/the-hacker-news.png differ diff --git a/logos/tiny_news/the-hollywood-reporter.png b/logos/tiny_news/the-hollywood-reporter.png new file mode 100644 index 0000000..da06289 Binary files /dev/null and b/logos/tiny_news/the-hollywood-reporter.png differ diff --git a/logos/tiny_news/the-independent.png b/logos/tiny_news/the-independent.png new file mode 100644 index 0000000..fc3f5c6 Binary files /dev/null and b/logos/tiny_news/the-independent.png differ diff --git a/logos/tiny_news/the-indian-express.png b/logos/tiny_news/the-indian-express.png new file mode 100644 index 0000000..ccbe952 Binary files /dev/null and b/logos/tiny_news/the-indian-express.png differ diff --git a/logos/tiny_news/the-japan-times.png b/logos/tiny_news/the-japan-times.png new file mode 100644 index 0000000..d6b1e29 Binary files /dev/null and b/logos/tiny_news/the-japan-times.png differ diff --git a/logos/tiny_news/the-mirror.png b/logos/tiny_news/the-mirror.png new file mode 100644 index 0000000..c3fe27b Binary files /dev/null and b/logos/tiny_news/the-mirror.png differ diff --git a/logos/tiny_news/the-moscow-times.png b/logos/tiny_news/the-moscow-times.png new file mode 100644 index 0000000..a3db231 Binary files /dev/null and b/logos/tiny_news/the-moscow-times.png differ diff --git a/logos/tiny_news/the-motley-fool-australia.png b/logos/tiny_news/the-motley-fool-australia.png new file mode 100644 index 0000000..2b49e9f Binary files /dev/null and b/logos/tiny_news/the-motley-fool-australia.png differ diff --git a/logos/tiny_news/the-motley-fool.png b/logos/tiny_news/the-motley-fool.png new file mode 100644 index 0000000..2b49e9f Binary files /dev/null and b/logos/tiny_news/the-motley-fool.png differ diff --git a/logos/tiny_news/the-new-york-times.png b/logos/tiny_news/the-new-york-times.png new file mode 100644 index 0000000..c219eea Binary files /dev/null and b/logos/tiny_news/the-new-york-times.png differ diff --git a/logos/tiny_news/the-register.png b/logos/tiny_news/the-register.png new file mode 100644 index 0000000..33c274f Binary files /dev/null and b/logos/tiny_news/the-register.png differ diff --git a/logos/tiny_news/the-seattle-times.png b/logos/tiny_news/the-seattle-times.png new file mode 100644 index 0000000..0704d40 Binary files /dev/null and b/logos/tiny_news/the-seattle-times.png differ diff --git a/logos/tiny_news/the-telegraph.png b/logos/tiny_news/the-telegraph.png new file mode 100644 index 0000000..f7d1157 Binary files /dev/null and b/logos/tiny_news/the-telegraph.png differ diff --git a/logos/tiny_news/the-times-of-israel.png b/logos/tiny_news/the-times-of-israel.png new file mode 100644 index 0000000..450b158 Binary files /dev/null and b/logos/tiny_news/the-times-of-israel.png differ diff --git a/logos/tiny_news/the-us-sun.png b/logos/tiny_news/the-us-sun.png new file mode 100644 index 0000000..66ea054 Binary files /dev/null and b/logos/tiny_news/the-us-sun.png differ diff --git a/logos/tiny_news/the-weather-channel.png b/logos/tiny_news/the-weather-channel.png new file mode 100644 index 0000000..69775e5 Binary files /dev/null and b/logos/tiny_news/the-weather-channel.png differ diff --git a/logos/tiny_news/times-of-india.png b/logos/tiny_news/times-of-india.png new file mode 100644 index 0000000..bc0ce1b Binary files /dev/null and b/logos/tiny_news/times-of-india.png differ diff --git a/logos/tiny_news/tnw.png b/logos/tiny_news/tnw.png new file mode 100644 index 0000000..a4555c5 Binary files /dev/null and b/logos/tiny_news/tnw.png differ diff --git a/logos/tiny_news/tvline.png b/logos/tiny_news/tvline.png new file mode 100644 index 0000000..d29605f Binary files /dev/null and b/logos/tiny_news/tvline.png differ diff --git a/logos/tiny_news/variety.png b/logos/tiny_news/variety.png new file mode 100644 index 0000000..659cc26 Binary files /dev/null and b/logos/tiny_news/variety.png differ diff --git a/logos/tiny_news/vice.png b/logos/tiny_news/vice.png new file mode 100644 index 0000000..6688dbe Binary files /dev/null and b/logos/tiny_news/vice.png differ diff --git a/logos/tiny_news/vox.com.png b/logos/tiny_news/vox.com.png new file mode 100644 index 0000000..5bf034f Binary files /dev/null and b/logos/tiny_news/vox.com.png differ diff --git a/logos/tiny_news/vulture.png b/logos/tiny_news/vulture.png new file mode 100644 index 0000000..ff8b7a3 Binary files /dev/null and b/logos/tiny_news/vulture.png differ diff --git a/logos/tiny_news/washington-times.png b/logos/tiny_news/washington-times.png new file mode 100644 index 0000000..ab20555 Binary files /dev/null and b/logos/tiny_news/washington-times.png differ diff --git a/logos/tiny_news/wfla.png b/logos/tiny_news/wfla.png new file mode 100644 index 0000000..6a917f1 Binary files /dev/null and b/logos/tiny_news/wfla.png differ diff --git a/logos/tiny_news/wgrz.com.png b/logos/tiny_news/wgrz.com.png new file mode 100644 index 0000000..14cef71 Binary files /dev/null and b/logos/tiny_news/wgrz.com.png differ diff --git a/logos/tiny_news/wired.co.uk.png b/logos/tiny_news/wired.co.uk.png new file mode 100644 index 0000000..05c1de2 Binary files /dev/null and b/logos/tiny_news/wired.co.uk.png differ diff --git a/logos/tiny_news/wjw-fox-8-news-cleveland.png b/logos/tiny_news/wjw-fox-8-news-cleveland.png new file mode 100644 index 0000000..e5daa22 Binary files /dev/null and b/logos/tiny_news/wjw-fox-8-news-cleveland.png differ diff --git a/logos/tiny_news/wjxt-news4jax-.png b/logos/tiny_news/wjxt-news4jax-.png new file mode 100644 index 0000000..25923cb Binary files /dev/null and b/logos/tiny_news/wjxt-news4jax-.png differ diff --git a/logos/tiny_news/wkrn-news-2.png b/logos/tiny_news/wkrn-news-2.png new file mode 100644 index 0000000..07248b5 Binary files /dev/null and b/logos/tiny_news/wkrn-news-2.png differ diff --git a/logos/tiny_news/wkyt.png b/logos/tiny_news/wkyt.png new file mode 100644 index 0000000..149aa6c Binary files /dev/null and b/logos/tiny_news/wkyt.png differ diff --git a/logos/tiny_news/wsoc-charlotte.png b/logos/tiny_news/wsoc-charlotte.png new file mode 100644 index 0000000..df2f43a Binary files /dev/null and b/logos/tiny_news/wsoc-charlotte.png differ diff --git a/logos/tiny_news/wtvc.png b/logos/tiny_news/wtvc.png new file mode 100644 index 0000000..886cf34 Binary files /dev/null and b/logos/tiny_news/wtvc.png differ diff --git a/logos/tiny_news/wwlp.com.png b/logos/tiny_news/wwlp.com.png new file mode 100644 index 0000000..59352a2 Binary files /dev/null and b/logos/tiny_news/wwlp.com.png differ diff --git a/logos/tiny_news/wwmt-tv.png b/logos/tiny_news/wwmt-tv.png new file mode 100644 index 0000000..1524c3a Binary files /dev/null and b/logos/tiny_news/wwmt-tv.png differ diff --git a/logos/tiny_news/yahoo!-voices.png b/logos/tiny_news/yahoo!-voices.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo!-voices.png differ diff --git a/logos/tiny_news/yahoo-canada-finance.png b/logos/tiny_news/yahoo-canada-finance.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-canada-finance.png differ diff --git a/logos/tiny_news/yahoo-canada.png b/logos/tiny_news/yahoo-canada.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-canada.png differ diff --git a/logos/tiny_news/yahoo-finance.png b/logos/tiny_news/yahoo-finance.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-finance.png differ diff --git a/logos/tiny_news/yahoo-life.png b/logos/tiny_news/yahoo-life.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-life.png differ diff --git a/logos/tiny_news/yahoo-news.png b/logos/tiny_news/yahoo-news.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-news.png differ diff --git a/logos/tiny_news/yahoo-sports.png b/logos/tiny_news/yahoo-sports.png new file mode 100644 index 0000000..66f726a Binary files /dev/null and b/logos/tiny_news/yahoo-sports.png differ diff --git a/pulsing-brightness.py b/pulsing-brightness.py new file mode 100644 index 0000000..e927c35 --- /dev/null +++ b/pulsing-brightness.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python +from samplebase import SampleBase + + +class GrayscaleBlock(SampleBase): + def __init__(self, *args, **kwargs): + super(GrayscaleBlock, self).__init__(*args, **kwargs) + + def run(self): + max_brightness = self.matrix.brightness + count = 0 + c = 255 + + while (True): + if self.matrix.brightness < 1: + self.matrix.brightness = max_brightness + count += 1 + else: + self.matrix.brightness -= 1 + + if count % 4 == 0: + self.matrix.Fill(c, 0, 0) + elif count % 4 == 1: + self.matrix.Fill(0, c, 0) + elif count % 4 == 2: + self.matrix.Fill(0, 0, c) + elif count % 4 == 3: + self.matrix.Fill(c, c, c) + + self.usleep(20 * 1000) + +# Main function +if __name__ == "__main__": + grayscale_block = GrayscaleBlock() + if (not grayscale_block.process()): + grayscale_block.print_help() diff --git a/pulsing-colors.py b/pulsing-colors.py new file mode 100644 index 0000000..c585174 --- /dev/null +++ b/pulsing-colors.py @@ -0,0 +1,42 @@ +#!/usr/bin/env python +from samplebase import SampleBase + + +class PulsingColors(SampleBase): + def __init__(self, *args, **kwargs): + super(PulsingColors, self).__init__(*args, **kwargs) + + def run(self): + self.offscreen_canvas = self.matrix.CreateFrameCanvas() + continuum = 0 + + while True: + self.usleep(5 * 1000) + continuum += 1 + continuum %= 3 * 255 + + red = 0 + green = 0 + blue = 0 + + if continuum <= 255: + c = continuum + blue = 255 - c + red = c + elif continuum > 255 and continuum <= 511: + c = continuum - 256 + red = 255 - c + green = c + else: + c = continuum - 512 + green = 255 - c + blue = c + + self.offscreen_canvas.Fill(red, green, blue) + self.offscreen_canvas = self.matrix.SwapOnVSync(self.offscreen_canvas) + +# Main function +if __name__ == "__main__": + pulsing_colors = PulsingColors() + if (not pulsing_colors.process()): + pulsing_colors.print_help() diff --git a/samplebase.py b/samplebase.py new file mode 100644 index 0000000..85f0516 --- /dev/null +++ b/samplebase.py @@ -0,0 +1,81 @@ +import argparse +import time +import sys +import os + +sys.path.append(os.path.abspath(os.path.dirname(__file__) + '/..')) +from rgbmatrix import RGBMatrix, RGBMatrixOptions + + +class SampleBase(object): + def __init__(self, *args, **kwargs): + self.parser = argparse.ArgumentParser() + + self.parser.add_argument("-r", "--led-rows", action="store", help="Display rows. 16 for 16x32, 32 for 32x32. Default: 32", default=32, type=int) + self.parser.add_argument("--led-cols", action="store", help="Panel columns. Typically 32 or 64. (Default: 32)", default=32, type=int) + self.parser.add_argument("-c", "--led-chain", action="store", help="Daisy-chained boards. Default: 1.", default=1, type=int) + self.parser.add_argument("-P", "--led-parallel", action="store", help="For Plus-models or RPi2: parallel chains. 1..3. Default: 1", default=1, type=int) + self.parser.add_argument("-p", "--led-pwm-bits", action="store", help="Bits used for PWM. Something between 1..11. Default: 11", default=11, type=int) + self.parser.add_argument("-b", "--led-brightness", action="store", help="Sets brightness level. Default: 100. Range: 1..100", default=100, type=int) + self.parser.add_argument("-m", "--led-gpio-mapping", help="Hardware Mapping: regular, adafruit-hat, adafruit-hat-pwm" , choices=['regular', 'regular-pi1', 'adafruit-hat', 'adafruit-hat-pwm'], type=str) + self.parser.add_argument("--led-scan-mode", action="store", help="Progressive or interlaced scan. 0 Progressive, 1 Interlaced (default)", default=1, choices=range(2), type=int) + self.parser.add_argument("--led-pwm-lsb-nanoseconds", action="store", help="Base time-unit for the on-time in the lowest significant bit in nanoseconds. Default: 130", default=130, type=int) + self.parser.add_argument("--led-show-refresh", action="store_true", help="Shows the current refresh rate of the LED panel") + self.parser.add_argument("--led-slowdown-gpio", action="store", help="Slow down writing to GPIO. Range: 0..4. Default: 1", default=1, type=int) + self.parser.add_argument("--led-no-hardware-pulse", action="store", help="Don't use hardware pin-pulse generation") + self.parser.add_argument("--led-rgb-sequence", action="store", help="Switch if your matrix has led colors swapped. Default: RGB", default="RGB", type=str) + self.parser.add_argument("--led-pixel-mapper", action="store", help="Apply pixel mappers. e.g \"Rotate:90\"", default="", type=str) + self.parser.add_argument("--led-row-addr-type", action="store", help="0 = default; 1=AB-addressed panels; 2=row direct; 3=ABC-addressed panels; 4 = ABC Shift + DE direct", default=0, type=int, choices=[0,1,2,3,4]) + self.parser.add_argument("--led-multiplexing", action="store", help="Multiplexing type: 0=direct; 1=strip; 2=checker; 3=spiral; 4=ZStripe; 5=ZnMirrorZStripe; 6=coreman; 7=Kaler2Scan; 8=ZStripeUneven... (Default: 0)", default=0, type=int) + self.parser.add_argument("--led-panel-type", action="store", help="Needed to initialize special panels. Supported: 'FM6126A'", default="", type=str) + self.parser.add_argument("--led-no-drop-privs", dest="drop_privileges", help="Don't drop privileges from 'root' after initializing the hardware.", action='store_false') + self.parser.set_defaults(drop_privileges=True) + + def usleep(self, value): + time.sleep(value / 1000000.0) + + def run(self): + print("Running") + + def process(self): + self.args = self.parser.parse_args() + + options = RGBMatrixOptions() + + if self.args.led_gpio_mapping != None: + options.hardware_mapping = self.args.led_gpio_mapping + options.rows = self.args.led_rows + options.cols = self.args.led_cols + options.chain_length = self.args.led_chain + options.parallel = self.args.led_parallel + options.row_address_type = self.args.led_row_addr_type + options.multiplexing = self.args.led_multiplexing + options.pwm_bits = self.args.led_pwm_bits + options.brightness = self.args.led_brightness + options.pwm_lsb_nanoseconds = self.args.led_pwm_lsb_nanoseconds + options.led_rgb_sequence = self.args.led_rgb_sequence + options.pixel_mapper_config = self.args.led_pixel_mapper + options.panel_type = self.args.led_panel_type + + + if self.args.led_show_refresh: + options.show_refresh_rate = 1 + + if self.args.led_slowdown_gpio != None: + options.gpio_slowdown = self.args.led_slowdown_gpio + if self.args.led_no_hardware_pulse: + options.disable_hardware_pulsing = True + if not self.args.drop_privileges: + options.drop_privileges=False + + self.matrix = RGBMatrix(options = options) + + try: + # Start loop + print("Press CTRL-C to stop sample") + self.run() + except KeyboardInterrupt: + print("Exiting\n") + sys.exit(0) + + return True diff --git a/server.py b/server.py index ed7da0d..2d43ca4 100755 --- a/server.py +++ b/server.py @@ -678,16 +678,28 @@ def screensaver(): if "Pulsating Colors" in data: - screensaver_p = pexpect.spawn("sudo -E python3 ./rpi-rgb-led-matrix/bindings/python/samples/pulsing-colors.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1") + screensaver_p = pexpect.spawn("sudo -E python3 pulsing-colors.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1") elif "Rotating Square" in data: - screensaver_p = pexpect.spawn("sudo -E python3 ./rpi-rgb-led-matrix/bindings/python/samples/rotating-block-generator.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1") + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 0") elif "Pulsating brightness" in data: - screensaver_p = pexpect.spawn("sudo -E python3 ./rpi-rgb-led-matrix/bindings/python/samples/pulsing-brightness.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1") + screensaver_p = pexpect.spawn("sudo -E python3 pulsing-brightness.py --led-gpio-mapping=adafruit-hat --led-slowdown-gpio=4 -r 32 --led-cols 64 -c 2 -P 1") - elif "Game of Life" in data: - screensaver_p = pexpect.spawn("sudo -E python3 game_of_life.py") + elif "Volume Bars" in data: + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 9") + + elif "Evolution of Color" in data: + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 10 -m 100") + + elif "Conway's Game of Life" in data: + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 7 -m 100") + + elif "Abelian Sandpile Model" in data: + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 6") + + elif "Grayscale Block" in data: + screensaver_p = pexpect.spawn("sudo ./demo --led-gpio-mapping=adafruit-hat --led-rows=32 --led-cols=128 -D 5") elif "Sleep" in data: screensaver_p = DummyProcess() diff --git a/static/app.js b/static/app.js index 0da7811..02ffd8b 100755 --- a/static/app.js +++ b/static/app.js @@ -1770,19 +1770,11 @@ function togglePass() { function showDiv() { document.getElementById('update-message').style.display = "block"; - - setTimeout(function showDiv(){ - document.getElementById('update-message').style.display = "none"; -}, 30000); } function showDivTwo() { document.getElementById('wifi-message').style.display = "block"; - - setTimeout(function showDivTwo(){ - document.getElementById('wifi-message').style.display = "none"; -}, 30000); } diff --git a/static/images/favicon.png b/static/images/favicon.png new file mode 100644 index 0000000..eb95b13 Binary files /dev/null and b/static/images/favicon.png differ diff --git a/stockTicker.py b/stockTicker.py index 4714eaf..624c23e 100755 --- a/stockTicker.py +++ b/stockTicker.py @@ -2115,11 +2115,11 @@ class StockTicker(): except Exception as e: away_logo = self.textImage(strAwayTeam.replace(' ', '\n'), extra_small_font, r = 255, g = 255, b = 255) - img.paste(home_logo, (x_offset,0)) + img.paste(away_logo, (x_offset,0)) - x_offset += home_logo.size[0] + 4 + x_offset += away_logo.size[0] + 4 - score_image = self.textImage(intHomeScore + '-' + intAwayScore, large_font, h_buff = 5, r = 255, g = 255, b = 255) + score_image = self.textImage(intAwayScore + '-' + intHomeScore, large_font, h_buff = 5, r = 255, g = 255, b = 255) try: h_colour = mcolors.to_rgb(sports_info[strHomeTeam]['colour'].replace(' ', '')) @@ -2145,25 +2145,25 @@ class StockTicker(): main_offset = x_offset + int(max(vs_size, date_timage.size[0], score_image.size[0])/2) img.paste(date_timage,(main_offset - int(date_timage.size[0]/2),0)) img.paste(vs_timage, (main_offset - int(vs_timage.size[0]/2),10)) - img.paste(hc_timage, (main_offset - int(vs_timage.size[0]/2) - hc_timage.size[0], 9)) + img.paste(ac_timage, (main_offset - int(vs_timage.size[0]/2) - ac_timage.size[0], 9)) img.paste(score_image, (main_offset - int(score_image.size[0]/2), 15)) - if match['isLive'] == 'post': - if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): - u_image = Image.new("RGB", (hc_timage.size[0] -2, 1)) - u_image1 = ImageDraw.Draw(u_image) - u_image1.line((0,0,hc_timage.size[0]-2,0), fill="red", width = 0) - img.paste(u_image, (main_offset - int(vs_timage.size[0]/2)-hc_timage.size[0], hc_timage.size[1]+7)) - img.paste(ac_timage, (main_offset + int(vs_timage.size[0]/2),9)) if match['isLive'] == 'post': if int(intHomeScore) < int(intAwayScore) or int(intHomeScore) == int(intAwayScore): - ua_image = Image.new("RGB", (ac_timage.size[0] -2, 1)) + ua_image = Image.new("RGB", (hc_timage.size[0] -2, 1)) ua_image1 = ImageDraw.Draw(ua_image) - ua_image1.line((0,0,ac_timage.size[0]-2,0), fill="red", width = 0) - img.paste(ua_image, (main_offset + int(vs_timage.size[0]/2), ac_timage.size[1]+7)) - x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + ac_timage.size[0], int(score_image.size[0]/2)) + 4) + ua_image1.line((0,0,hc_timage.size[0]-2,0), fill="red", width = 0) + img.paste(ua_image, (main_offset - int(vs_timage.size[0]/2)-ac_timage.size[0], ac_timage.size[1]+7)) + img.paste(hc_timage, (main_offset + int(vs_timage.size[0]/2),9)) + if match['isLive'] == 'post': + if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): + u_image = Image.new("RGB", (ac_timage.size[0] -2, 1)) + u_image1 = ImageDraw.Draw(u_image) + u_image1.line((0,0,ac_timage.size[0]-2,0), fill="red", width = 0) + img.paste(u_image, (main_offset + int(vs_timage.size[0]/2), hc_timage.size[1]+7)) + x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + hc_timage.size[0], int(score_image.size[0]/2)) + 4) - img.paste(away_logo, (x_offset,0)) - x_offset += away_logo.size[0] + buff_size + img.paste(home_logo, (x_offset,0)) + x_offset += home_logo.size[0] + buff_size img = img.crop((0,0,x_offset,32)) imgs.append(img) @@ -2319,9 +2319,9 @@ class StockTicker(): except Exception as e: away_logo = self.textImage(strAwayTeam.replace(' ', '\n'), extra_small_font, r = 255, g = 255, b = 255) - img.paste(home_logo, (x_offset,0)) + img.paste(away_logo, (x_offset,0)) - x_offset += home_logo.size[0] + 4 + x_offset += away_logo.size[0] + 4 if time == 'future': #img.paste(date_timage, (x_offset+5, 0)) @@ -2350,11 +2350,11 @@ class StockTicker(): img.paste(date_timage, (main_offset - int(date_timage.size[0]/2), 0)) img.paste(vs_timage, (main_offset - int(vs_timage.size[0]/2),9)) - img.paste(hc_timage, (main_offset - int(vs_timage.size[0]/2) - hc_timage.size[0], 9)) - img.paste(ac_timage, (main_offset + int(vs_timage.size[0]/2),9)) - x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + ac_timage.size[0]) + 6) + img.paste(ac_timage, (main_offset - int(vs_timage.size[0]/2) - ac_timage.size[0], 9)) + img.paste(hc_timage, (main_offset + int(vs_timage.size[0]/2),9)) + x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + hc_timage.size[0]) + 6) else: - score_image = self.textImage(intHomeScore + '-' + intAwayScore, large_font, h_buff = 5, r = 255, g = 255, b = 255) + score_image = self.textImage(intAwayScore + '-' + intHomeScore, large_font, h_buff = 5, r = 255, g = 255, b = 255) try: h_colour = mcolors.to_rgb(sports_info[strHomeTeam]['colour'].replace(' ', '')) except: @@ -2379,29 +2379,32 @@ class StockTicker(): main_offset = x_offset + int(max(vs_size, date_timage.size[0], score_image.size[0])/2) img.paste(date_timage,(main_offset - int(date_timage.size[0]/2),0)) img.paste(vs_timage,(main_offset - int(vs_timage.size[0]/2),10)) - img.paste(hc_timage, (main_offset - int(vs_timage.size[0]/2) - hc_timage.size[0], 9)) + img.paste(ac_timage, (main_offset - int(vs_timage.size[0]/2) - ac_timage.size[0], 9)) img.paste(score_image, (main_offset - int(score_image.size[0]/2), 15)) - if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): - u_image = Image.new("RGB", (hc_timage.size[0] -2, 1)) - u_image1 = ImageDraw.Draw(u_image) - u_image1.line((0,0,hc_timage.size[0]-2,0), fill="red", width = 0) - img.paste(u_image, (main_offset - int(vs_timage.size[0]/2)-hc_timage.size[0], hc_timage.size[1]+7)) - img.paste(ac_timage, (main_offset + int(vs_timage.size[0]/2),9)) if int(intHomeScore) < int(intAwayScore) or int(intHomeScore) == int(intAwayScore): ua_image = Image.new("RGB", (ac_timage.size[0] -2, 1)) ua_image1 = ImageDraw.Draw(ua_image) ua_image1.line((0,0,ac_timage.size[0]-2,0), fill="red", width = 0) - img.paste(ua_image, (main_offset + int(vs_timage.size[0]/2), ac_timage.size[1]+7)) + img.paste(ua_image, (main_offset - int(vs_timage.size[0]/2)-ac_timage.size[0], ac_timage.size[1]+7)) + img.paste(hc_timage, (main_offset + int(vs_timage.size[0]/2),9)) + if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): + u_image = Image.new("RGB", (hc_timage.size[0] -2, 1)) + u_image1 = ImageDraw.Draw(u_image) + u_image1.line((0,0,hc_timage.size[0]-2,0), fill="red", width = 0) + img.paste(u_image, (main_offset + int(vs_timage.size[0]/2), hc_timage.size[1]+7)) + x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + hc_timage.size[0], int(score_image.size[0]/2)) + 4) - x_offset = (main_offset + max(int(date_timage.size[0]/2), int(vs_timage.size[0]/2) + ac_timage.size[0], int(score_image.size[0]/2)) + 4) - - img.paste(away_logo, (x_offset,0)) + img.paste(home_logo, (x_offset,0)) - x_offset += away_logo.size[0] + x_offset += home_logo.size[0] x_offset += buff_size img = img.crop((0,0,x_offset ,32)) imgs.append(img) + + + + except Exception as e: pass # logf = open('log.txt', "a") @@ -2741,10 +2744,10 @@ class StockTicker(): error = False - img.paste(home_logo1, (x_offset,0)) - x_offset += (home_logo1.size[0] + 2) + img.paste(away_logo1, (x_offset,0)) + x_offset += (away_logo1.size[0] + 2) - score_image = self.textImage(intHomeScore + '-' + intAwayScore, font, h_buff = 5, r = 255, g = 255, b = 255) + score_image = self.textImage(intAwayScore + '-' + intHomeScore, font, h_buff = 5, r = 255, g = 255, b = 255) try: h_colour = mcolors.to_rgb(sports_info[strHomeTeam]['colour'].replace(' ', '')) @@ -2766,18 +2769,10 @@ class StockTicker(): error = True if date_timage.size[0] > (hc_timage.size[0] + 2 + score_image.size[0] + ac_timage.size[0]): - x_offset10 = x_offset + int((date_timage.size[0]/2)-(score_image.size[0]/2)-hc_timage.size[0]) + x_offset10 = x_offset + int((date_timage.size[0]/2)-(score_image.size[0]/2)-ac_timage.size[0]) img.paste(date_timage,(x_offset, 0)) img.paste(score_image, (x_offset + int((date_timage.size[0]/2)-(score_image.size[0]/2)), 5)) x_offset += date_timage.size[0] - img.paste(hc_timage,(x_offset10, 5)) - if match['isLive'] == 'post': - if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): - u_image = Image.new("RGB", (hc_timage.size[0] -3, 1)) - u_image1 = ImageDraw.Draw(u_image) - u_image1.line((0,0,hc_timage.size[0]-3,0), fill="red", width = 0) - img.paste(u_image, (x_offset10, hc_timage.size[1]+4)) - x_offset10 += hc_timage.size[0] + score_image.size[0] img.paste(ac_timage,(x_offset10, 5)) if match['isLive'] == 'post': if int(intHomeScore) < int(intAwayScore) or int(intHomeScore) == int(intAwayScore): @@ -2785,32 +2780,29 @@ class StockTicker(): ua_image1 = ImageDraw.Draw(ua_image) ua_image1.line((0,0,ac_timage.size[0]-3,0), fill="red", width = 0) img.paste(ua_image, (x_offset10, ac_timage.size[1]+4)) - x_offset10 += ac_timage.size[0] - if error: - img.paste(away_logo1, (max(x_offset + date_timage.size[0], x_offset10),0)) - x_offset += (away_logo1.size[0] + date_timage.size[0]) - else: - img.paste(away_logo1, (max(x_offset,x_offset10),0)) - x_offset += away_logo1.size[0] - - - else: - x_offset_date = (x_offset + hc_timage.size[0] + int(score_image.size[0]/2) - int(date_timage.size[0]/2)) - img.paste(date_timage, (x_offset_date,0)) - #img.paste(date_timage, (x_offset+20+int((score_image.size[0] - date_timage.size[0])/2),0)) - img.paste(hc_timage, (x_offset, 5)) - + x_offset10 += ac_timage.size[0] + score_image.size[0] + img.paste(hc_timage,(x_offset10, 5)) if match['isLive'] == 'post': if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): u_image = Image.new("RGB", (hc_timage.size[0] -3, 1)) u_image1 = ImageDraw.Draw(u_image) u_image1.line((0,0,hc_timage.size[0]-3,0), fill="red", width = 0) - img.paste(u_image, (x_offset, hc_timage.size[1]+4)) + img.paste(u_image, (x_offset10, hc_timage.size[1]+4)) + x_offset10 += hc_timage.size[0] + if error: + img.paste(home_logo1, (max(x_offset + date_timage.size[0], x_offset10),0)) + x_offset += (home_logo1.size[0] + date_timage.size[0]) + else: + img.paste(home_logo1, (max(x_offset,x_offset10),0)) + x_offset += home_logo1.size[0] - x_offset += hc_timage.size[0] - img.paste(score_image, (x_offset, 5)) - x_offset += score_image.size[0] + + else: + x_offset_date = (x_offset + ac_timage.size[0] + int(score_image.size[0]/2) - int(date_timage.size[0]/2)) + img.paste(date_timage, (x_offset_date,0)) + #img.paste(date_timage, (x_offset+20+int((score_image.size[0] - date_timage.size[0])/2),0)) img.paste(ac_timage, (x_offset, 5)) + if match['isLive'] == 'post': if int(intHomeScore) < int(intAwayScore) or int(intHomeScore) == int(intAwayScore): ua_image = Image.new("RGB", (ac_timage.size[0] -3, 1)) @@ -2818,13 +2810,23 @@ class StockTicker(): ua_image1.line((0,0,ac_timage.size[0]-3,0), fill="red", width = 0) img.paste(ua_image, (x_offset, ac_timage.size[1]+4)) x_offset += ac_timage.size[0] + img.paste(score_image, (x_offset, 5)) + x_offset += score_image.size[0] + img.paste(hc_timage, (x_offset, 5)) + if match['isLive'] == 'post': + if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): + u_image = Image.new("RGB", (hc_timage.size[0] -3, 1)) + u_image1 = ImageDraw.Draw(u_image) + u_image1.line((0,0,hc_timage.size[0]-3,0), fill="red", width = 0) + img.paste(u_image, (x_offset, hc_timage.size[1]+4)) + x_offset += hc_timage.size[0] x_offset_date += date_timage.size[0] if error: - img.paste(away_logo1, (max(x_offset + date_timage.size[0], x_offset_date),0)) - x_offset += (away_logo1.size[0] + date_timage.size[0]) + img.paste(home_logo1, (max(x_offset + date_timage.size[0], x_offset_date),0)) + x_offset += (home_logo1.size[0] + date_timage.size[0]) else: - img.paste(away_logo1, (max(x_offset,x_offset_date),0)) - x_offset += away_logo1.size[0] + img.paste(home_logo1, (max(x_offset,x_offset_date),0)) + x_offset += home_logo1.size[0] x_offset += buff_size x_offset += 20 img = img.crop((0,0,x_offset ,16)) @@ -2988,8 +2990,8 @@ class StockTicker(): error = False - img.paste(home_logo1, (x_offset,0)) - x_offset += (home_logo1.size[0] + 2) + img.paste(away_logo1, (x_offset,0)) + x_offset += (away_logo1.size[0] + 2) if time == 'future': @@ -3016,15 +3018,15 @@ class StockTicker(): x_offsetdate2 = x_offset + int((hc_timage.size[0] + vs_timage.size[0] + ac_timage.size[0])/2)- int(date_timage.size[0]/2) img.paste(date_timage, (x_offsetdate2,0)) x_offsetdate2 += date_timage.size[0] - img.paste(hc_timage, (x_offset, 5)) - x_offset += hc_timage.size[0] - img.paste(vs_timage, (x_offset, 5)) - x_offset += vs_timage.size[0] img.paste(ac_timage, (x_offset, 5)) x_offset += ac_timage.size[0] + img.paste(vs_timage, (x_offset, 5)) + x_offset += vs_timage.size[0] + img.paste(hc_timage, (x_offset, 5)) + x_offset += hc_timage.size[0] #x_offset += max(date_timage.size[0], (hc_timage.size[0] + vs_timage.size[0] + ac_timage.size[0])) else: - score_image = self.textImage(intHomeScore + '-' + intAwayScore, font, h_buff = 5, r = 255, g = 255, b = 255) + score_image = self.textImage(intAwayScore + '-' + intHomeScore, font, h_buff = 5, r = 255, g = 255, b = 255) try: h_colour = mcolors.to_rgb(sports_info[strHomeTeam]['colour'].replace(' ', '')) except: @@ -3045,19 +3047,10 @@ class StockTicker(): ac_timage = self.textImage('.', small_font, r = 255, g = 255, b = 255) error = True - x_offsetdate2 = x_offset + hc_timage.size[0] + int(score_image.size[0]/2)- int(date_timage.size[0]/2) + x_offsetdate2 = x_offset + ac_timage.size[0] + int(score_image.size[0]/2)- int(date_timage.size[0]/2) img.paste(date_timage, (x_offsetdate2,0)) x_offsetdate2 += date_timage.size[0] #img.paste(date_timage, (x_offset+20+int((score_image.size[0] - date_timage.size[0])/2),0)) - img.paste(hc_timage, (x_offset, 5)) - if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): - u_image = Image.new("RGB", (hc_timage.size[0] -3, 1)) - u_image1 = ImageDraw.Draw(u_image) - u_image1.line((0,0,hc_timage.size[0]-3,0), fill="red", width = 0) - img.paste(u_image, (x_offset, hc_timage.size[1]+4)) - x_offset += hc_timage.size[0] - img.paste(score_image, (x_offset, 5)) - x_offset += score_image.size[0] img.paste(ac_timage, (x_offset, 5)) if int(intHomeScore) < int(intAwayScore) or int(intHomeScore) == int(intAwayScore): ua_image = Image.new("RGB", (ac_timage.size[0] -3, 1)) @@ -3065,6 +3058,15 @@ class StockTicker(): ua_image1.line((0,0,ac_timage.size[0]-3,0), fill="red", width = 0) img.paste(ua_image, (x_offset, ac_timage.size[1]+4)) x_offset += ac_timage.size[0] + img.paste(score_image, (x_offset, 5)) + x_offset += score_image.size[0] + img.paste(hc_timage, (x_offset, 5)) + if int(intHomeScore) > int(intAwayScore) or int(intHomeScore) == int(intAwayScore): + u_image = Image.new("RGB", (hc_timage.size[0] -3, 1)) + u_image1 = ImageDraw.Draw(u_image) + u_image1.line((0,0,hc_timage.size[0]-3,0), fill="red", width = 0) + img.paste(u_image, (x_offset, hc_timage.size[1]+4)) + x_offset += hc_timage.size[0] # if date_timage.size[0] > score_image.size[0]: # img.paste(date_timage, (x_offset+2, 0)) @@ -3084,11 +3086,11 @@ class StockTicker(): # x_offset += max( date_timage.size[0]+4, hc_timage.size[0] + vs_timage.size[0] + ac_timage.size[0]+4, 2 + int(score_image.size[0])) if error: - img.paste(away_logo1, (max(x_offset + date_timage.size[0], x_offsetdate2),0)) - x_offset += (away_logo1.size[0] + date_timage.size[0]) + img.paste(home_logo1, (max(x_offset + date_timage.size[0], x_offsetdate2),0)) + x_offset += (home_logo1.size[0] + date_timage.size[0]) else: - img.paste(away_logo1, (max(x_offset, x_offsetdate2),0)) - x_offset += away_logo1.size[0] + img.paste(home_logo1, (max(x_offset, x_offsetdate2),0)) + x_offset += home_logo1.size[0] x_offset += buff_size x_offset += 20 img = img.crop((0,0,x_offset ,16)) @@ -4111,7 +4113,7 @@ class StockTicker(): return GIFs - + def getMoviesImage(self): f = open('csv/movie_settings.json', 'r') @@ -4136,7 +4138,22 @@ class StockTicker(): vote_img = self.textImage(movie['votes'], small_font, r = 255, g = 255, b = 255) star_img = Image.open('logos/star.png').convert('RGB') date_img = self.textImage(movie['date'], small_font, r = 0, g = 162, b = 255) - + try: + if movie['media_type'] == 'Movie': + if movie['budget'] == '0': + budget_img = self.textImage('$N/A', small_font, r = 255, g = 0, b = 0) + else: + budget_img = self.textImage('$' + movie['budget'], small_font, r = 255, g = 0, b = 0) + except: + pass + try: + if movie['media_type'] == 'Movie': + if movie['revenue'] == '0': + rev_img = self.textImage('$N/A', small_font, r = 0, g = 255, b = 0) + else: + rev_img = self.textImage('$' + movie['revenue'], small_font, r = 0, g = 255, b = 0) + except: + pass try: logo = Image.open('logos/movies/' + movie['backdrop']) logo.thumbnail((9000,32)) @@ -4151,7 +4168,13 @@ class StockTicker(): genre_img = self.textImage(genre + ',', small_font, r = 255, g = 255, b = 255) genre_offset += genre_img.size[0] - img = Image.new('RGB', (max(x_offset + movie_title_img.size[0], x_offset + date_img.size[0] + 3 + star_img.size[0] + vote_img.size[0] + 3, x_offset + date_img.size[0] + 3 + genre_offset) + 15, 32)) + try: + if movie['media_type'] == 'Movie': + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0], x_offset + date_img.size[0] + 3 + star_img.size[0] + vote_img.size[0] + 3 + 5 + budget_img.size[0] + 5 + rev_img.size[0], x_offset + date_img.size[0] + 3 + genre_offset) + 15, 32)) + else: + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0], x_offset + date_img.size[0] + 3 + star_img.size[0] + vote_img.size[0] + 3, x_offset + date_img.size[0] + 3 + genre_offset) + 15, 32)) + except: + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0], x_offset + date_img.size[0] + 3 + star_img.size[0] + vote_img.size[0] + 3, x_offset + date_img.size[0] + 3 + genre_offset) + 15, 32)) img.paste(logo, (0, 0)) @@ -4162,7 +4185,17 @@ class StockTicker(): x_offset2 = x_offset img.paste(star_img, (x_offset2 , 14)) img.paste(vote_img, (x_offset2 + star_img.size[0] + 3, 14)) - + + try: + if movie['media_type'] == 'Movie': + img.paste(budget_img, (x_offset2 + star_img.size[0] + 3 + vote_img.size[0] + 5, 14)) + except: + pass + try: + if movie['media_type'] == 'Movie': + img.paste(rev_img,(x_offset2 + star_img.size[0] + 3 + vote_img.size[0] + 5 + budget_img.size[0] + 5, 14)) + except: + pass for genre in movie['genre'][:-1]: genre_img = self.textImage(genre + ',', small_font, r = 255, g = 255, b = 255) img.paste(genre_img, (x_offset2, 23)) @@ -4176,7 +4209,7 @@ class StockTicker(): return self.stitchImage(image_list) - + def getMoviesProfessional(self): f = open('csv/movie_settings.json', 'r') @@ -4201,7 +4234,22 @@ class StockTicker(): vote_img = self.textImage(movie['votes'], small_font, r = 255, g = 255, b = 255) star_img = Image.open('logos/star.png').convert('RGB') date_img = self.textImage(movie['date'], small_font, r = 0, g = 162, b = 255) - + try: + if movie['media_type'] == 'Movie': + if movie['budget'] == '0': + budget_img = self.textImage('$N/A', small_font, r = 255, g = 0, b = 0) + else: + budget_img = self.textImage('$' + movie['budget'], small_font, r = 255, g = 0, b = 0) + except: + pass + try: + if movie['media_type'] == 'Movie': + if movie['revenue'] == '0': + rev_img = self.textImage('$N/A', small_font, r = 0, g = 255, b = 0) + else: + rev_img = self.textImage('$' + movie['revenue'], small_font, r = 0, g = 255, b = 0) + except: + pass try: logo = Image.open('logos/movies/' + movie['backdrop']) logo.thumbnail((1000,16)) @@ -4217,7 +4265,13 @@ class StockTicker(): genre_img = self.textImage(genre + ',', small_font, r = 255, g = 255, b = 255) genre_offset += genre_img.size[0] - img = Image.new('RGB', (max(x_offset + movie_title_img.size[0] + 3 + star_img.size[0] + 2 + vote_img.size[0] + 10, x_offset + date_img.size[0] + 7 + lang_img.size[0] + 7 + genre_offset + 10), 16)) + try: + if movie['media_type'] == 'Movie': + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0] + 3 + star_img.size[0] + 2 + vote_img.size[0] + 10 + 3 + budget_img.size[0] + 3 + rev_img.size[0], x_offset + date_img.size[0] + 7 + lang_img.size[0] + 7 + genre_offset + 10), 16)) + else: + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0] + 3 + star_img.size[0] + 2 + vote_img.size[0] + 10, x_offset + date_img.size[0] + 7 + lang_img.size[0] + 7 + genre_offset + 10), 16)) + except: + img = Image.new('RGB', (max(x_offset + movie_title_img.size[0] + 3 + star_img.size[0] + 2 + vote_img.size[0] + 10, x_offset + date_img.size[0] + 7 + lang_img.size[0] + 7 + genre_offset + 10), 16)) img.paste(logo, (0, 0)) img.paste(movie_title_img, (x_offset,0)) @@ -4225,6 +4279,18 @@ class StockTicker(): img.paste(star_img, (x_offset2, 1)) x_offset2 += star_img.size[0] + 2 img.paste(vote_img, (x_offset2, 2)) + x_offset2 += vote_img.size[0] + try: + if movie['media_type'] == 'Movie': + img.paste(budget_img, (x_offset2 + 3, 2)) + except: + pass + try: + if movie['media_type'] == 'Movie': + img.paste(rev_img,(x_offset2 + 3 + budget_img.size[0] + 3, 2)) + except: + pass + img.paste(date_img, (x_offset, 10)) x_offset += date_img.size[0] + 7 img.paste(lang_img, (x_offset, 10)) @@ -4242,8 +4308,8 @@ class StockTicker(): image_list.append(img) return self.stitchImage(image_list) - - + + def displayStocks(self): diff --git a/templates/images/favicon.png b/templates/images/favicon.png new file mode 100644 index 0000000..eb95b13 Binary files /dev/null and b/templates/images/favicon.png differ diff --git a/templates/index.html b/templates/index.html index a9cab2e..3237bb2 100644 --- a/templates/index.html +++ b/templates/index.html @@ -14,9 +14,9 @@ - Fintic - + Fintic - Web Control Panel + @@ -67,7 +67,7 @@ - + @@ -122,7 +122,8 @@ -

Version 1.3.2

+

Version 1.3.3

+

Changelog

@@ -268,11 +269,19 @@ - + - + + + + + + + + + @@ -4055,7 +4064,7 @@ © 2020-2023 Fintic Limited., All Rights Reserved. Contact Us.

-

Data Provided by IEX Cloud, Openweathermap, CoinGecko, Exchangerate-API, TheSportsDB, Commodities-API, NewsAPI, Yahoo Finance, ESPN, The Movie DB

+

Data Provided by IEX Cloud, Openweathermap, CoinGecko, Exchangerate-API, TheSportsDB, Commodities-API, Google News, Yahoo Finance, ESPN, The Movie DB

Useful resources: YouTube Tutorials , Formatting Guide & Info , Official Website

@@ -7621,7 +7630,7 @@ - +