From 2630bcda72cd1575d02a2077cac2a32909daf6e2 Mon Sep 17 00:00:00 2001 From: Neythen Date: Fri, 16 Jul 2021 11:00:37 +0100 Subject: [PATCH] minr fixes --- csv/crypto.csv | 6 ++--- csv/current_weather.json | 2 +- csv/daily_weather.json | 2 +- csv/last_updates.json | 1 - csv/news.csv | 40 +++++++++++++++---------------- csv/tickers.csv | 6 ++--- display_images/crypto.ppm | Bin 63278 -> 63278 bytes display_images/daily_weather.ppm | Bin 74702 -> 74702 bytes display_images/stocks.ppm | Bin 82670 -> 82670 bytes display_images/today_weather.ppm | Bin 53582 -> 53582 bytes stockTicker.py | 20 ++++++++-------- 11 files changed, 38 insertions(+), 39 deletions(-) diff --git a/csv/crypto.csv b/csv/crypto.csv index e60505b..470d6b9 100644 --- a/csv/crypto.csv +++ b/csv/crypto.csv @@ -1,4 +1,4 @@ symbol,name,base,current,24hr change -BTC,bitcoin,usd,31554,-4.613357050355953 -ETH,ethereum,gbp,1389.61,-4.851321076226648 -DOGE,dogecoin,usd,0.184145,-8.017861229371038 +BTC,bitcoin,usd,31398,-3.6158218938894335 +ETH,ethereum,gbp,1353.54,-5.118073955848297 +DOGE,dogecoin,usd,0.182451,-6.2565374215444765 diff --git a/csv/current_weather.json b/csv/current_weather.json index e1582e5..77982fd 100644 --- a/csv/current_weather.json +++ b/csv/current_weather.json @@ -1 +1 @@ -[{"main_weather": "Clouds", "description": "scattered clouds", "temp": 29.76, "min_temp": 28.5, "max_temp": 30.61, "feels_like": 36.76, "humidity": 81, "clouds": 31, "wind_speed": 0.45, "wind_direction": 275, "visibility": 10000, "uv": 0, "rain_chance": 0}, {"main_weather": "Clouds", "description": "overcast clouds", "temp": 19.71, "min_temp": 14.35, "max_temp": 21.63, "feels_like": 19.62, "humidity": 72, "clouds": 90, "wind_speed": 5.14, "wind_direction": 360, "visibility": 10000, "uv": 0.36, "rain_chance": 0}] \ No newline at end of file +[{"main_weather": "Clouds", "description": "broken clouds", "temp": 29.67, "min_temp": 28.44, "max_temp": 30.37, "feels_like": 36.67, "humidity": 82, "clouds": 74, "wind_speed": 0.45, "wind_direction": 9, "visibility": 10000, "uv": 0.42, "rain_chance": 0.32}, {"main_weather": "Clear", "description": "clear sky", "temp": 20.59, "min_temp": 12.13, "max_temp": 25.26, "feels_like": 20.3, "humidity": 61, "clouds": 0, "wind_speed": 2.57, "wind_direction": 0, "visibility": 10000, "uv": 5.94, "rain_chance": 0}] \ No newline at end of file diff --git a/csv/daily_weather.json b/csv/daily_weather.json index 28cf74b..bd247e6 100644 --- a/csv/daily_weather.json +++ b/csv/daily_weather.json @@ -1 +1 @@ -[[{"main_weather": "Rain", "description": "light rain", "min_temp": 28.5, "max_temp": 30.61}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 28.04, "max_temp": 29.77}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.64, "max_temp": 29.24}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.7, "max_temp": 28.62}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.62, "max_temp": 29.4}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.97, "max_temp": 30.11}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.69, "max_temp": 31.64}, {"main_weather": "Rain", "description": "light rain", "min_temp": 30.01, "max_temp": 32.67}], [{"main_weather": "Clouds", "description": "broken clouds", "min_temp": 14.35, "max_temp": 21.63}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 12.58, "max_temp": 26.02}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 16.35, "max_temp": 27.43}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 17.91, "max_temp": 27.84}, {"main_weather": "Clouds", "description": "broken clouds", "min_temp": 17.11, "max_temp": 21.74}, {"main_weather": "Rain", "description": "light rain", "min_temp": 15.75, "max_temp": 21.98}, {"main_weather": "Clouds", "description": "broken clouds", "min_temp": 12.8, "max_temp": 21.13}, {"main_weather": "Rain", "description": "light rain", "min_temp": 14.45, "max_temp": 15.92}]] \ No newline at end of file +[[{"main_weather": "Rain", "description": "light rain", "min_temp": 28.44, "max_temp": 30.37}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.83, "max_temp": 29.38}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.46, "max_temp": 28.27}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 26.86, "max_temp": 27.9}, {"main_weather": "Rain", "description": "moderate rain", "min_temp": 27.2, "max_temp": 28.18}, {"main_weather": "Rain", "description": "light rain", "min_temp": 27.33, "max_temp": 29.33}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.22, "max_temp": 31.57}, {"main_weather": "Rain", "description": "light rain", "min_temp": 28.13, "max_temp": 31.38}], [{"main_weather": "Clear", "description": "clear sky", "min_temp": 12.13, "max_temp": 25.26}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 15.69, "max_temp": 27.68}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 18.42, "max_temp": 28.52}, {"main_weather": "Rain", "description": "light rain", "min_temp": 17.16, "max_temp": 23.64}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 15.21, "max_temp": 24.05}, {"main_weather": "Clear", "description": "clear sky", "min_temp": 14.51, "max_temp": 23.63}, {"main_weather": "Clouds", "description": "overcast clouds", "min_temp": 14.55, "max_temp": 22.1}, {"main_weather": "Rain", "description": "light rain", "min_temp": 16.33, "max_temp": 25.36}]] \ No newline at end of file diff --git a/csv/last_updates.json b/csv/last_updates.json index 96ff93b..e69de29 100644 --- a/csv/last_updates.json +++ b/csv/last_updates.json @@ -1 +0,0 @@ -{"stocks": "15/07/2021 14:46:31", "crypto": "15/07/2021 14:46:34", "news": "15/07/2021 14:09:38", "weather": "15/07/2021 14:09:35", "forex": "14/07/2021 18:58:56", "sports": "15/07/2021 14:09:39"} \ No newline at end of file diff --git a/csv/news.csv b/csv/news.csv index edc4efc..aaf12de 100644 --- a/csv/news.csv +++ b/csv/news.csv @@ -1,21 +1,21 @@ headline,source,date,time -Asus ROG Zephyrus S17 (2021) Review - PCMag,PCMag.com,2021-07-15,16:21:43Z -Covid-19: 994 cases reported in State with HSE on higher alert due to rising numbers of infections - The Irish Times,The Irish Times,2021-07-15,16:18:45Z -'We have never seen such a disaster': Dozens dead after heavy flooding in Europe - Stuff.co.nz,Stuff.co.nz,2021-07-15,16:18:00Z -China Criticized the Afghan War. Now It Worries About the Withdrawal. - The New York Times,New York Times,2021-07-15,16:16:00Z -Bukayo Saka: England winger won't allow negativity to break him after Euro 2020 final disappointment - Sky Sports,Sky Sports,2021-07-15,16:14:04Z -Isolation facilities ready for Delta variant – DoH - The Manila Times,The Manila Times,2021-07-15,16:12:18Z -Plant-based diet rich in soy reduces troubling menopause symptoms by 84% - News-Medical.Net,News-Medical.Net,2021-07-15,16:07:00Z -UK plan for Troubles amnesty breaches international obligations – Irish minister - The Guardian,The Guardian,2021-07-15,16:00:00Z -Calamba local exec survives ambush try - GMA News Online,GMA News,2021-07-15,15:59:04Z -Darts icon and former world champion Andy Fordham dies^ aged 59 - Daily Mail,Daily Mail,2021-07-15,15:57:53Z -Britney Spears' former attorney says change in conservatorship case is imminent: 'We're going to see lawsuits' - Fox News,Fox News,2021-07-15,15:43:58Z -Young YOU | What's happening with the Hubble telescope | You - News24,News24,2021-07-15,15:42:51Z -Engineers find imaging technique could become treatment for deep vein thrombosis - EurekAlert,EurekAlert,2021-07-15,15:41:04Z -Top 10 Covid updates: Third wave likely by end of August^ but numbers may not be high^ says ICMR - Scroll.in,Scroll.in,2021-07-15,15:41:00Z -Brookfield revises hostile bid for Inter Pipeline after losing court challenge^ raises cash price - The Globe and Mail,The Globe And Mail,2021-07-15,15:36:47Z -Britain records 63 Covid deaths in highest daily toll since MARCH - Daily Mail,Daily Mail,2021-07-15,15:32:17Z -Hailey Bieber Shut Down The “Beyond False” Accusations That Justin Bieber “Aggressively Yelled” At Her In A Viral TikTok - BuzzFeed News,BuzzFeed News,2021-07-15,15:31:00Z -‘Leaked’ Kremlin documents suggest Vladimir Putin personally authorised operation to help Donald Trump win in 2016 - NEWS.com.au,News.com.au,2021-07-15,15:27:48Z -Dutch crime reporter Peter de Vries dies after being shot in the head - Telegraph.co.uk,Telegraph.co.uk,2021-07-15,15:25:00Z -GTA Online update reveals "gigantic" shared social space to show off your cars - Eurogamer.net,Eurogamer.net,2021-07-15,15:25:00Z +Germany-Belgium floods – live: 90 dead and 1^300 missing in ‘catastrophe’^ with more rain forecast in Europe - The Independent,Independent,2021-07-16,08:35:46Z +IATF approves PH hosting of Asian women's volleyball tilt in August - CNN Philippines,CNN Philippines,2021-07-16,08:35:19Z +COVID-19 kills 162 more in PH^ says DOH - INQUIRER.net,Inquirer.net,2021-07-16,08:34:00Z +Cele headed back to Phoenix as violence continues in parts of KZN - Eyewitness News,EWN,2021-07-16,08:29:45Z +Years away from PBA^ Gab Banal gives Alaska steady presence - Rappler,Rappler,2021-07-16,08:21:00Z +EU new car sales rise^ as Bank of Japan cuts economic growth forecast – business live - The Guardian,The Guardian,2021-07-16,08:19:26Z +Ten stories from China: Mars^ beautiful music and an emotional reunion - CGTN,Cgtn.com,2021-07-16,08:11:21Z +As Delta drives COVID surge^ vaccines^ strategies under scrutiny - Al Jazeera English,Al Jazeera English,2021-07-16,08:10:15Z +UK hot weather: 'Bermuda blowtorch' 90F scorcher to singe Britain for Freedom Day - maps - Daily Express,Express,2021-07-16,08:09:30Z +Children's viruses that disappeared during pandemic lockdowns are back^ doctors say - CBC.ca,CBC News,2021-07-16,08:00:00Z +Evacuations as flooding hits Buller district^ locals urged to get grab bags ready - Stuff.co.nz,Stuff.co.nz,2021-07-16,07:54:00Z +PDP-Laban House members back Cusi leadership - Rappler,Rappler,2021-07-16,07:53:00Z +Majority of clinical cases of COVID-19 breakthrough infection due to Delta variant: ICMR study - The New Indian Express,The New Indian Express,2021-07-16,07:46:00Z +Aussie scientists see life-saving potential in spider venom to halt effects of heart attacks - GMA News Online,GMA News,2021-07-16,07:44:26Z +Lions coach Gatland pokes fun at Rassie's 'water boy' role - News24,News24,2021-07-16,07:42:05Z +93 people dead and hundreds missing in huge floods in Germany and Belgium - TheJournal.ie,TheJournal.ie,2021-07-16,07:41:00Z +Driving instructor allegedly falsified motorbike licences for gang members - Stuff.co.nz,Stuff.co.nz,2021-07-16,07:40:00Z +Unconventional superconductor acts the part of a promising quantum computing platform - Phys.org,Phys.Org,2021-07-16,07:30:13Z +Kyla opens up about suffering third miscarriage - Rappler,Rappler,2021-07-16,07:29:00Z +Indian photojournalist Danish Siddiqui killed in Afghanistan’s Kandahar province - Hindustan Times,Hindustan Times,2021-07-16,07:23:12Z diff --git a/csv/tickers.csv b/csv/tickers.csv index cfe82d9..ac8e790 100644 --- a/csv/tickers.csv +++ b/csv/tickers.csv @@ -1,4 +1,4 @@ name,current,opening -MSFT,280.31,282.16 -NFLX,540.37,554.86 -GOOG,2620.4,2647.615 +MSFT,281.06,282.16 +NFLX,542.98,554.86 +GOOG,2625.98,2647.615 diff --git a/display_images/crypto.ppm b/display_images/crypto.ppm index f5e8d6457443169ab9947a6f09d8be65431aad38..49431e94e748147264225c5f555b906efcfce04e 100755 GIT binary patch delta 1611 zcmah~U5Fc16h@~E1Va-BMh6DQnGy&D0t10{7Z=7oqNwc z=R4o|&Pnru(tMz_`qP;BItPE+;&M=V|7BEbZy?OS!rxJz8L(GWO!OVkHu*W?*#@e= zskrpnvG~T4ziz`s<>ZUl?!E-~2NS0nre}{Oj-$sihG%Dj)h~Wj;9g8&vYA79$wGL_ zfxTqFZ5RTFXYWJxjD=2p1ny5o9J*7Ajx&s%#(ZdEiHDV!>#MgJB2@&G!aSKl$#^S&Kkk!-2cJQ5jM#L*E3>D*wls$_n1ulp>^>h~J_+thl7YR#Z> zSx5Hs6j4*X%NAR~f^g{1>c~8z__+PmnL1qv_FP$0xVLckD~;w7^?kTMRYVtKbkEmJlRtejw|(N(CN<6u1e5ux*nR87(6tyb zB3gk=I;c@oy$wAQNKlB{zzDQEkHw(LF(Tb1gY0$5VCU|E7>HTA+bUJ4vLeY~7V}NmnnWcvB4*mP q7hEY1zb*0?O_7Yj#MG3M5RwxA3fm9gmUa{U#4R;n462Xn&;0{BbM}q^ delta 1532 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 Pm~7ART!C{1Vg>#m`14XF literal 74702 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 Q+-KG6IG%Dny(xGSB&Lw{C(aKCIpCcfRxe ze!p|h@4M4S+ozAVmp&Vob8ErC`lK#%N!XSbK@_uz!c;dp!y!zUc9#7IEhvm^kwp_? zC}PXezOY6;R0sN=)}fr0rYP*F!#Q% z@UD&%n|xUB@nNOk{Z0=WSiKSCC5{&H<@ovF6H;`55B1+PY@7?@x0`*KoY3&oW8Sj) z^BW#aU(~)>0d%BAe2QnSym%d*+71*W8Xs(9qr;H1hF(njITzyCO);KbaUAR9!r4g zl;Vq~Yx*He_s%MhZxWMJi# z4-Z|k(0}q7tbe%*llx4nqER>&KrwD%?rU$kZ~RXW)~|G9?0C zn%(!}?JI_>m9P0osJU2=(z`=5z89iV{|4LO6YG`ewvs;q(?c@g?g%tvHyC3!G?yn~rB zFLhx&FSs$Nlbb1|KSCXnsYbAJIiO6BqHK9E2q$42V4->jL71J3TBI7N^zC@SZwP*0+$kvJXk|Bn;(6l;(b;?DD{K z4A#QxTQRkp2Ck=hzVb6N+gasKHld74rvo<2AJ;;bS+$_5P+L|l*zL}x;yvyn-Ri=7 z8{F}?3R86FUDPl)vzwDQAGw1=m^&SzaW~PPA!~_(Idp0R>;YwR&Lo)!ZA)GySx;%L zDOWl8D&-;@Qfz=-B&7UmBMd3s3U_qwmjDfmzIYe8z${fWB-5LyWKGkE4~Slv2h7?> zST%B1m7S*Aq~a+r-L?q0#S`Y^;R(;f$LjZY<##W_ktN`BGbXp@!mZAb`A$>k&v9Zm zlfpZH?a}Q>${a9S!l@)>vGRi!R5e!V^S=Hn0Zbm&G4qp7_p5p-pspd0;km1y(MiMr zy*}_8Lj<$G#sSbB9|UB2GoAuNS17mYO@KMdlfH>dtLodnU9z3F#ULbRNCu>Q?i?%=g)^IJA$D2Q%MF7 zM(OPQ){<>dlkVE-t zi%x6`Qs#PyK0g|$TED#8M%js!v^#_$BLRl@7)ZKX&s4u-@Y^uervNufjSfTZX~XHf zArchXe-rc_%J#-&ZG~__(*Wuu*CBz}80hx-$xJTYR;thS(EU$CG&+7p=F`ZWo$yL_ z$PX>qT~xl|>U8BBjvwuSr$O2NI5oCJHT4kHzYH+-YVL};go@+t;K2~(CR4J|E-Y$X z;R-4&fIpX(MIo%`z{dgJ#O0pMBt=-}lcGmP4B=5>!X$gZY^F)HZ~&`*?*Ahw^A=8C znLrCW5nOqTgLN4LoXXKivUk!{m`ib92Ze+x9Pt{}kFBE2F5ui^3?7Y=ea)fb4}t38 zYyY(Abf~*ajR&suR)`?we-8QCy6Es!HvoDlFY573OQz70M3Ys5HPj-d`m;ER#RXzz z^&bsV;U*e$>s*UU(vMxlqA?lPooT@;PQF58+11s|-Q7!ADN$K?k#mNqJnibcBG(ff zv>34|Jt5w%rvBO`aBoVML)@@Q%+9R25LCBCTv07w4&rZEL2PeaCHpGRT%h{$jBMlkc<^u&etd3oy;SeFpdkYd3et&3iIN>aY0Y5( z-6LrJaSRv6n!ystFs{o1FZ-|;dhK2q6r`s$kA9V2M8ug_8a~kEl%MX>4$+tlDId{g z>Mhw*%pj>j=AZ0pBm0giYwJX}tZc@xDO+hwsx)bi?BU)hgMn&;^!KHNkM)QuDBwVj z2<3t_UV`lGfrP5EY%E74rWr>}(6MA>iGY{vHDz+C7*&d9Sj7jpwi9nE6EOz2TbDBz zK_9tEY=b3xf?tJ)cfTMGJyY0(%=BX1>YbvO?{%TyC<0loaD`4&7T1VRWKD?UG=I;8 zT;r;~b=BoX4O+<4Ei-B0$&TP7eke~HJhK5hJ{0gr#FE(#QRC|2TwI?66RO?AKTSOG zMK!J6PA>d6406kaHrmiIH1-(=@o7c($igb|A$(PP#DDP_kj0fCj$iv^dadZwHaHum z{4I;4w=DvK?a;-e;mQ4`IKw$HISyHW24!(06o%tTB~os=|A695`7Q&qHtCBeAu7zQ zW5J$%a`2?RL$E%vq^3fQ-{rh&0$o|Q#K+G;A4V&_7OkUkHC}vlr*`bdq@m`QYr9GQ zv{n>Y@w{BL1+nGxhEuzdVaA*4xVZ@Cdm7sZLXJ5&?LBTSnSg3nc{;5x@t}Go|Lg{E zXmnWQL2l)4VGUncFLns3Uuv1L3RRNDL~D=XmasmXHq00e+A|ZBWf!}qcDqY{zd;PM zm|flZh%5T^{((Vx&ehXN9cN!4DtPx$zmDEK=dt(TMZHX(Cy9NKGsHDG5jD0dON z`SNz30*#%Xk*D4e1OC?27*(_c*KOFlT)St{v&p;ibW)sR&_Sw<#(ap-wcfYtH`-e)0k}J35q$99t)i8e)J>1f`rl}rcpe&2JR^PF>@b8=(2^u};$dO;~d%j=PI`Qd)gfIH?xs?3L;(*`V6#gSGO*}-lk zDpYI;Xim6nhw^zBoa|t$Vq5c^kESRk$>|2d&l|{^L8Q-k5t-#h+-D$Hp}}g?F@C(> zwiXxc`;n{mCS4k;#ffSiLmnR@zD8skf(X~@yh#gMGsavmKZM~?YlGq}t}ZJAu?+4d zZd@++VElO%nR6O4?Jc$y{67GkAj;H(H9<}Bv&RETqA}=9?>ijay@N?=UkD2vl zNv#^$#tAy#N8D6-?D`!K54!1O8%h3H%~ZJO==gh$3!h9;al1xCXpV}dUtK1H7_Zbx zpWks$drgsP&1?=JQ>WqD8o|1Xs3YE)kvtA(L*U&99-MGn>D&z7Qjm$5i1+D;jG0I@ zJjEpDlNl*B5H~bLk2NB@=F86C>c9O^hexfYBB)B-4C)NbTPDU=Y4~H?uO|VFu}&hh>XF^#L+%AHq6<`yg0{7yaQtbwm)9X$*NW64Qnt;D z#6oYrpfw&-@#p1@7#TD%dzA?$7@-yGkT^eEp_6@g*@*j0Hh>@F9X<(p{2hK?$p+|Y zmPTS78q#0aaN~@MPb~J2j zH^uSvpg~Ll#A;P$euZr{%D_7iI>vH{%)yb9COQvWIJI^+j4ZKqd$ z6Yj%|`?`+k3!-0C=fgEqOW^L*@zXdDuJZ6T1ueUUQG-RHBG+Ibv+hX@^=jC+_UDrS zR7!_N$`1-{lxg#L!DhKZOhkid)F84`FFo3 zU>rzof1GVYF&JW`HAwUt%m6#)q-PS0DA2qrF(#c^?wB?SD!kd{d}U**1d$hifjL{% z0tt_?JS~=$fz(_Lu`O%Rw?npOa`O|mTLDz|9ze+P7NV+iI=3F=1o2gq&Z7UeXBAS)vsPPY zAl$i_$fzI!RXP5#Gl6)#8GB#!vNwFB$15o$D#v>LDv_9v-496~lI>YSUVMbZ!xuT9 z7ivz=o&iM$8IOl()^u8S*HTCP4>a?v$O{|UOU=I_?Vx856Hi@B^;Z=AZiz#3dNCjL zy`QhC`1C-3kxL!Rze`SgBLsCpdFCGY?3;U@6o34mZ*ixdwjoeQqM%D<~(b^YNjJpUdsj$$>_M7u8Gs z`Q;(1?OENnUX@k2*jaX@qXgDkL)2Mv_Y6WYn5<-S6UN^pz_S$1TFvQ8{*W_vY1N~5 z)pIce7>$MLB`9iYLag@DY~F&2z9giQ<`t<4y(!K4)6pe)DUQxF=vc+&C%6kN;AHbl zO~`heQtlJ$+^kU#emuk(Rm&p|NB2OJv==R>0&;>9xBQ$n479vNku>PSi_eA`?>h<5 z#MJv>w>@O1UKYdnqQ|MQ z){swtwypZYsPZCjx`OI3!G}gZICIZ7CkH}^5BqVGQ!#Umx;D#C4_5@&Rd?aFJ>de3 zJWcVp>#2%F?2%e5Xvv%OV$YU9LE{8+FZzc~+~m3%bqedMpytY`rEIeW5Bz|faE-|)U!W590{D<4G*{PDY|rUFQNfb#A~eHkJN2xB!QMb2G-g~7Yr;Pg zz`wZVTN>+jHsBRwdlu!Q5_dn2Wc?q^qqUPlw0wn<80%8CY1}o z1r2qVgfrVSUvBWZ3QkG6AE~&+2`K$E;nMjToEzM)-eO>{Puz9tF8#jjuFFAQ=KjgX z>^ZH;zl`4NvVee2NxMb_0>mkV(6kALE`p3uoJxgF zN`t4Bp$s+n{LqmSL`>E~5CrVr$ku5oUb`VCZ6tqfnmUzC`(vB7uHL_BEqm_lxNayc zNL>^s=ezHFzvq44=lyZFNAquw=EpbW!~c|wsUi)bB{GbB6#+?xt5ifFsKd31&+=4+ zrw$?VWf8l*l2u>OE6it;6`mRptY0n=@(}b?AdpX!O=@PRgg})W$u1q!Zz-7GQg0f| zGbgx_D%PS!5{h+&moi35bok$`LO|CLTUL&+N=wojg6^J=<%F?buo{aCY#7_VjMj11bi0PO@HWh?*vZs^DLEgKr zA~o?+#?Ln$N5cAV=d;gBO|%Q9QH`m^rEpct_{ZWR+*u&v-eL*i{7q2MT(EN`fP>?+DHH|aYy}HA~c|+j;&H22q+xOvG)`-}ta?@A=*HhI9E|rn$ zs>(d()-KAt%8#SFM09NQIfAf*<0_;0y1GrHl8+?(=7??@jnUzXv>guvr696Fq4I3~ zmVcf-t7GH7ybLdeRG5fReYX?+;QlReZC#n+M@HR#FT%$a1Z!2qzb+xdJRI5DgZNnm ztDaT~T0(N1PM4{s(c=L6)28>ig~Ht}B7C!k=le3-y0Mi)3$4|VVw&D)+JWRV8tPk_ zDQ!N4PP-B7d z4(0x>41>;G9Q8f$s8}E2y6DnXk!&ice>#YGgmOMFTlK9`fg5$@XMg-_?k`$~{7#(- zOo?zElM(+BfiyA^rD6h*5R57~+C~n?NNpi5x1B`1{SZ2KOE}jgqWKI{#iKH1MB;bb zN{$tX_+aM{{u$Wi1T(;tj*r%uhTDp_Utqvb=vpp>>@~4eA>Q#*ggP0UuCL(U8amur zg1Rml>-Y4erNMa49-Nw>R*OU@cFy5DXk5X8j$uT;rC@wSfvcqy<3XyNHN^%p6SU>L zEZ4NPeoriqBzyHNk~tRyR!LwxX|)snS|;Yc_b}N75+~s=&%cc=gDa_5Pv#VAk!%Fo z=!EC7oRbu6o6zhEXBs{RUcqJN)~iDVxsc>F^w6A_nq$5=v7oFe_xi(($Mcl^p>o=29?ZF)rcI_80t)zi>&4Y$85Q*fw#9VXWi;qU7Ci( zHQ%+HTQ209=yPWsl)<4T2)$f_P-qdtq5U*LCDkgA&j;Is)?iPwAL0JhOgrjsP`2W| zS3eJAwX+~Prr}UjNf^huhON0MUqZELCkJ!&n4iwsiJ>sRUnDZt_yPhh#J>(l8XpAU zQSal=+sl#M&N}!6yYqnCN>#pV18&6aSE!LAK1{b(WFGv&rc$yx`-X+~M?Ggg>woyh zHU7fvE64P+tlXcXX~3;lSmuw2sOx1%U@5famR^uXh0Z>f-lZZ^%f;+GbLKCV}G}4w1HRJ7^2TrlG+>gJ-gM(PCW?Ll44%d5#~1I z>|&96Mzc}_9-%$W2LH~7y7Zdtmh44#Z}tu^aK57>BTxnB#w1&Vrtux8F*cy-oXJAjX(S&7R+~mBy}@caxh3yYw7Ca;A=mh~`6BwRumWB4T9N1v z1jKkFtSWO*QNm6=l`^fM6i1^`qUX58eifWx+l-0U`>$=vYx_cQ-ERcKARFapdX!C< zMy?f{V1bVuWUn38Q2jbbnb~neb0+lo>nTb@WBZ@&jg&G+li*NgbhzA^R8mjaow^h! zgLc=`bF6tYlZ=}t?170LQf5^y;|svqDjbYy_+(Ur>&%F0eC(9G{+CrWoa<@1--n0X z`BKi$gO;K9xR*V42aE%x&@zJ!wpm*C=>^y34c|89<>85FHbB?no-sycZB10TV+1cyMBz#TOSa%m< z^I$Q4MHX-L%DL9EOoxBsrCA@YU0?|&yXiMUo;-dtVTgj2Ok5J^`Z_M+i{7|`Z=B{^ z#=c6cf1-r%CX(*VLvfieYHz*C+1vilWL~OdH@v!+q;Qx_dEDIeQa)zzq-g{hL(W=1 zm*AQF4@VSRJyiQDQUEZwYV+MG@ixp z-|^z^J2KQGsx|WKJG{4U4#c3dHeuAH-;x7-!HjI6rdsThC|R!GHRsK_aZC6w$xs<{ diff --git a/stockTicker.py b/stockTicker.py index 127da5c..e198729 100644 --- a/stockTicker.py +++ b/stockTicker.py @@ -1304,12 +1304,12 @@ class StockTicker(): uv_img = Image.open(weather_dir + '/uv.png') img.paste(uv_img, ( 82, 22)) - utext_img = self.textImage(str(current_weather['uv']) , small_font) + utext_img = self.textImage(str(round(current_weather['uv'], 1)) , small_font) img.paste(utext_img, (95, 23)) weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] months =['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] - month = months[int(datetime.now().strftime('%m'))] + month = months[int(datetime.now().strftime('%m'))-1] date = str(int(datetime.now().strftime('%d'))) weekday = weekdays[datetime.today().weekday()] @@ -1363,7 +1363,7 @@ class StockTicker(): current_weathers = json.load(open('csv/current_weather.json', 'r')) weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] months =['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] - month = months[int(datetime.now().strftime('%m'))] + month = months[int(datetime.now().strftime('%m'))-1] date = str(int(datetime.now().strftime('%d'))) weekday = weekdays[datetime.today().weekday()] @@ -1433,7 +1433,7 @@ class StockTicker(): hum_img = Image.open(weather_dir + '/humidity.png') htext_img = self.textImage(str(current_weather['humidity']) + '%', font) uv_img = Image.open(weather_dir + '/uv.png') - utext_img = self.textImage(str(current_weather['uv']) , font) + utext_img = self.textImage(str(round(current_weather['uv'], 1)), font) rain_img = Image.open(weather_dir + '/rain-chance.png') @@ -1652,7 +1652,7 @@ class StockTicker(): weekdays = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] months =['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'] - month = months[int(datetime.now().strftime('%m'))] + month = months[int(datetime.now().strftime('%m'))-1] date = str(int(datetime.now().strftime('%d'))) weekday = weekdays[datetime.today().weekday()] date_img = self.textImage((month + ' ' + date + ',' + weekday).upper(), extra_small_font) @@ -1661,7 +1661,7 @@ class StockTicker(): hum_img = Image.open(weather_dir + '/humidity.png') htext_img = self.textImage(str(current_weather['humidity']) + '%', extra_small_font) uv_img = Image.open(weather_dir + '/uv.png') - utext_img = self.textImage(str(current_weather['uv']) , extra_small_font) + utext_img = self.textImage(str(round(current_weather['uv'], 1)) , extra_small_font) wind_img = Image.open(weather_dir + '/wind.png') wtext_img = self.textImage(str(current_weather['wind_speed']) + 'm/s'.upper(), extra_small_font) uv_img = Image.open(weather_dir + '/uv.png') @@ -1893,16 +1893,16 @@ class StockTicker(): def process_msg(self, msg): if msg == 'S': # stocks - self.scrollFunctionsAnimated(['stocks', 'stocks'], animation = 'continuous') + self.scrollFunctionsAnimated(['stocks', 'stocks'], animation = 'traditional') elif msg == 'C': # crypto - self.scrollFunctionsAnimated(['crypto', 'crypto'], animation = 'continuous') + self.scrollFunctionsAnimated(['crypto', 'crypto'], animation = 'traditional') elif msg == 'F': # forex - self.scrollFunctionsAnimated(['forex', 'forex'], animation = 'continuous') + self.scrollFunctionsAnimated(['forex', 'forex'], animation = 'traditional') elif msg == 'N': #news - self.scrollFunctionsAnimated(['news', 'news'], animation = 'continuous') + self.scrollFunctionsAnimated(['news', 'news'], animation = 'traditional') # speed settings elif msg == 's':