diff --git a/__pycache__/stockTicker.cpython-37.pyc b/__pycache__/stockTicker.cpython-37.pyc index 7f86e75..2420ae8 100644 Binary files a/__pycache__/stockTicker.cpython-37.pyc and b/__pycache__/stockTicker.cpython-37.pyc differ diff --git a/csv/crypto.csv b/csv/crypto.csv index 50a26a9..bc7a709 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,3 +1,3 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,36931,3.0260586808252348 -ETH,ethereum,gbp,1816.03,6.4687249212788815 +BTC,bitcoin,usd,38140,5.220972287309966 +ETH,ethereum,gbp,1966.44,8.603614342494295 diff --git a/csv/last_update.csv b/csv/last_update.csv index e9c1e1a..a4f09a8 100644 --- a/csv/last_update.csv +++ b/csv/last_update.csv @@ -1 +1 @@ -31/05/2021 07:21:51 +02/06/2021 11:35:50 diff --git a/csv/news.csv b/csv/news.csv index c28233c..9cd5ee6 100644 --- a/csv/news.csv +++ b/csv/news.csv @@ -1,21 +1,21 @@ headline,source,date,time -Twitter is working on tweet reactions so it can be more like Facebook - TechRadar,TechRadar,2021-05-31,10:35:22Z -Three-child policy: China lifts cap on births in major policy shift - The Straits Times,The Straits Times,2021-05-31,10:24:28Z -Saraki^ Ahmed to face prosecution over alleged mismanagement of Kwara properties - Vanguard,Vanguard,2021-05-31,10:23:24Z -Baby squid and 'water bears' part of ISS cargo: What NASA has planned for these little critters in space - Times Now,Zoom,2021-05-31,10:22:56Z -Prof Abdool Karim says Level 2 lockdown is 'right move' - IOL,IOL,2021-05-31,10:20:51Z -LIVE UPDATES: Jazz vs Grizzlies - NBA Western Conference playoffs first round 2021 - Rappler,Rappler,2021-05-31,10:17:00Z -Signal No. 1 up in parts of Northern^ Eastern Samar due to Tropical Storm Dante - Rappler,Rappler,2021-05-31,10:10:00Z -Duterte certifies as urgent creation of OFW department^ taxing POGOs - Rappler,Rappler,2021-05-31,10:05:00Z -ISS Canadarm2 robotic arm survives impact with orbital debris - SlashGear,SlashGear,2021-05-31,10:03:00Z -Nigerian govt engages Facebook over WhatsApp privacy policy - Premium Times,Premium Times,2021-05-31,09:57:59Z -The magazine of personal technology - Gadget,Gadget.co.za,2021-05-31,09:54:46Z -WhatsApp backs down on plan to block users who don’t accept controversial new privacy terms... - The Irish Sun,The Irish Sun,2021-05-31,09:53:40Z -New Study Shows Brain Training Programmes Not Associated With Benefits of Cognition - Gadgets 360,NDTV News,2021-05-31,09:53:09Z -Sahara Reporters publisher Omoyele Sowore says policewoman shot him - Guardian,Guardian Nigeria,2021-05-31,09:48:00Z -People who want alternative COVID-19 vaccines can get them under special access route - CNA,CNA,2021-05-31,09:45:44Z -Ayade Sacks Four Commissioners^ Five Other Appointees - Channels Television,Channels Television,2021-05-31,09:45:00Z -COVID vaccination guidelines eased for pregnant^ breastfeeding women^ cancer patients - Yahoo India News,Yahoo Entertainment,2021-05-31,09:42:15Z -Magashule gets High Court dates to challenge ANC suspension - Eyewitness News,EWN,2021-05-31,09:40:54Z -UP law professors to Duterte: Act in the best interest of Filipinos^ retract remarks on WPS - ABS-CBN News,Abs-cbn.com,2021-05-31,09:40:00Z -Sunday was hottest day of year with more sunshine on the way - The Irish Times,The Irish Times,2021-05-31,09:39:04Z +First human case of H10N3 bird flu in China: These are the symptoms - MARCA.com,Marca,2021-06-02,14:25:39Z +Canadarm2 damaged by ‘lucky strike’ from space junk in orbit - Global News,Global News,2021-06-02,14:21:44Z +Coronavirus latest news: Matt Hancock warns vaccine fake news is a ‘deadly threat’ - Telegraph.co.uk,Telegraph.co.uk,2021-06-02,14:20:59Z +Space Debris Damages Robotic Arm Attached to the International Space Station - PCMag AU,PCMag.com,2021-06-02,14:09:11Z +Big TSX companies tripled number of Black board members in past year — but there are still only 26 - CBC.ca,CBC News,2021-06-02,14:05:55Z +Huawei officially launches Android alternative HarmonyOS for smartphones - Yahoo Finance Australia,Yahoo Entertainment,2021-06-02,14:05:17Z +Space junk slams into International Space Station^ leaving hole in robotic arm - CBS News,CBS News,2021-06-02,14:03:59Z +COVID-19: Three-quarters of adults in UK have now had first vaccine dose - Sky News,Sky.com,2021-06-02,14:03:45Z +Dalian Atkinson: PC's fear 'through the roof' during arrest - BBC News,BBC News,2021-06-02,14:02:38Z +Dow Jones Today Targets 5th Advance As Stocks Inch Up; DXC Upgraded; BorgWarner Nails Hyundai EV Deal - Investor's Business Daily,Investor's Business Daily,2021-06-02,14:00:00Z +Ford^ Lecce expected to make announcement about Ontario school reopening plan - CBC.ca,CBC News,2021-06-02,13:52:35Z +Huawei MatePad Pro 12.6 in for review - GSMArena.com news - GSMArena.com,GSMArena.com,2021-06-02,13:52:01Z +Everton set to begin talks with Nuno Espirito Santo over vacant manager role - Sky Sports,Sky Sports,2021-06-02,13:42:25Z +2021's first solar eclipse will show off a 'ring of fire' in the sky - CNET,CNET,2021-06-02,13:36:57Z +Asus ROG Strix G17^ ROG Strix G15 Advantage Edition Gaming Laptops With AMD Radeon RX 6800M GPU Announced - Gadgets 360,NDTV News,2021-06-02,13:21:30Z +Venus Williams has perfect response to Naomi Osaka French Open drama - New York Post ,New York Post,2021-06-02,13:18:00Z +Australia's Victoria extends Melbourne COVID-19 lockdown for 2nd week - Reuters,Reuters,2021-06-02,13:18:00Z +Nets make quick work of short-handed Celtics in first round of playoffs^ but much tougher test awaits in Bucks - CBS Sports,CBS Sports,2021-06-02,13:09:00Z +First Solar Eclipse of the year 2021: will be visible only from Arunachal Pradesh in India - Arunachal24,Arunachal24.in,2021-06-02,13:08:44Z +CDPR Won’t Reveal ‘Cyberpunk 2077’ Q1 Sales^ But Estimates Are Shockingly Low - Forbes,Forbes,2021-06-02,13:05:30Z diff --git a/csv/tickers.csv b/csv/tickers.csv index 3419be1..d4161ba 100644 --- a/csv/tickers.csv +++ b/csv/tickers.csv @@ -1,4 +1,4 @@ name,current,opening -MSFT,249.68,250.995 -NFLX,502.81,504.4 -GOOG,2411.56,2421.96 +MSFT,248.47,248.125 +NFLX,500.285,499.82 +GOOG,2430.27,2435.31 diff --git a/display_image b/display_image index dda00e7..7a149d5 100755 Binary files a/display_image and b/display_image differ diff --git a/final.ppm b/final.ppm index 578d473..ff2eec7 100755 Binary files a/final.ppm and b/final.ppm differ diff --git a/log.txt b/log.txt index 05a0f7b..e69de29 100755 --- a/log.txt +++ b/log.txt @@ -1 +0,0 @@ -name 'sel' is not defined. file: stockTicker.py. line: 704. type: \ No newline at end of file diff --git a/stockTicker.py b/stockTicker.py index 85cd7d1..a548047 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -17,6 +17,8 @@ import pexpect from rgbmatrix import RGBMatrix, RGBMatrixOptions from rgbmatrix.graphics import * from multiprocessing import Process +import traceback + def getInput(Block=False): if Block or select.select([sys.stdin], [], [], 0) == ([sys.stdin], [], []): @@ -336,6 +338,7 @@ class StockTicker(): if msg == 'K': gif.close() self.resetMatrix() + break self.process_msg(msg) @@ -376,17 +379,16 @@ class StockTicker(): if msg == 'K': gif.close() self.resetMatrix() - break + return True self.process_msg(msg) except KeyboardInterrupt: sys.stdout.flush() pass - - + return False + + - - #Using change between min and day price give appropriate arrow #and set the overall change colour def getArrow(self, CHANGE): @@ -709,6 +711,7 @@ if __name__ == '__main__': log.write('. file: ' + fname) log.write('. line: ' + str(exc_tb.tb_lineno)) log.write('. type: ' + str(exc_type)) + log.write('\n ' + "".join(traceback.format_exception(sys.exc_info()[0], sys.exc_info()[1], sys.exc_info()[2])))