From fa91bc4a9bcc9e84e3aeb7d5cb24fbab87691694 Mon Sep 17 00:00:00 2001
From: Neythen <zcqsntr@ucl.ac.uk>
Date: Wed, 5 May 2021 16:22:01 +0100
Subject: [PATCH] persistant settings added

---
 __pycache__/stockTicker.cpython-37.pyc | Bin 8211 -> 8291 bytes
 api_caller.py                          |  45 +++++++++++++++++++
 csv/settings.csv                       |   1 +
 csv/tickers.csv                        |  38 ++++++++---------
 final.ppm                              | Bin 463983 -> 463983 bytes
 server.py                              |  33 +++++++++++---
 stockTicker.py                         |  57 ++++++++++++++++---------
 templates/index.html                   |  40 +++++------------
 8 files changed, 140 insertions(+), 74 deletions(-)
 create mode 100644 api_caller.py
 create mode 100644 csv/settings.csv

diff --git a/__pycache__/stockTicker.cpython-37.pyc b/__pycache__/stockTicker.cpython-37.pyc
index 982ce173af9323514b8356eddae6e361f9da9f28..e2520d196ad85dbd0630982af9a408424576809d 100644
GIT binary patch
delta 1471
zcmYjRU2GIp6u#%q%<k;$Z`*CR+ufyrSh~f4RAa!1Efy&lETshsLvdO64r^JuZSPD9
zDO-xRXreq6t}l{cTJ*seeOWR1<WFK^)K_C%qtTEUiGlc_iI1K$2zoc?yXU+2n=^OL
ze6y<mR)6<1(Wu36d~@T<iSK(EyG7*w&@k!8aQ|kPyUP&1yqsN-e>#apW;Z)6!de77
z>4a8Vo#ZOmZD*5C+b(uIVyB$cIJevF^vv}!=5#piPI{38bDCE&PI?vo&D#B}!)ZR1
z#qbqaA&#|kzA{JqGe3_p0i!G*xlM-}%GbBUHt4;Ixx;J_%;o|FUt+c<G@;|Hi!Koq
z<`US3*eF86!Ym-V)jRyfh}eLF7V$9F%hyBNw}HeyU|4@%7ku7WhO<wpyP=8byER@j
z!>pn&gKSsA+Pl!>S&MAms#zjf;qtc{TM4f+V8Wa?h8eO*&7#wev6)$&dC`i6S0(`!
zz`WS0_)3D*M{)NE#u%&Nz2thlQWsF+nD+{OUa!WG>pt)I&!o-snFu~V)A7I|bw1q1
z^GymO&ql)2a;oIGZeh|bD-pR4yHqf`RpUHX-y1y-a7}#~`wX5}ugCXx3}LV2eu80w
z0|X-kqv}pP2ZvNR@esVHwj@3UTm6w}3*II}$YUznbOOdzwJ8S$b*brT_^|$U(_x4n
zr`>UcJeMW4xuqS18f?iYUZC{?L585HF0|yMM=-UGog*Xr$K<&BsKtRV>e=KbfFIPJ
zRsk=m_gibwP(5wm8M{&XYdw%U3Ih$}<msuRCl6DhqXZQK7oia-PER{kA#+4@w>azM
zV{!v+&(MnDdPV8UNwv~`5$>w4^flP03b_vTQ#uA#{Z86|9kZnFBDGd>XBz?O6on(@
z7Fs^*7b%^da-Dq8uiJo=4Q*iba6^+*XXH7xHM7<5P!(6@%wKRp9nT8rQlDq9z-#JI
z?(y(Ww3Hh_0n^l*xpfOAPB{*mb&LTFw~9~$di}Bk4aCSGI0MbqVcg-k(<8JREAVPR
zax{i~QW!pe6nOyob0X;TwaCp%K%Vk65%TmJEP}8yOoUTx@ez&^LooV=h8i&10JnT|
z&Bfmj+<d#Q0h8r($qxp9nOo|UOL!vnNw{}G9>c7B^(`77_vHg}0lB<Du$JI4f-?l2
z2<QU8`!QOGKY#>fg9v-59c`E}Zh{GxhDh1H;B%=_Z>m%|I8mxNax>XFc;DAIavLG3
ze#~v(v5$)VXNDrt2ab?rod2DX-i>^N;1a>08d|gN$a+lirfp`(%2*L=n;AAEW|P^9
zXqs8mFjHp649aGdHOxX`vN%yK6y_3Wk1ej_c@x#LyBSFycIVef|N970@gcRTvm0Jk
z2RonGL;p#3#HFVxc>d$~9`pMuUm^8Hf>%jqxYLd!{Qlju9d+tncVl?ol=`YO4!x?;
XnN9bbT7a9};ub_O@W*2z4gvTFCy!S*

delta 1353
zcmYjPOKe+36rKD0Y(GE$o<DIub{q#n8iN2etqMq}4j|Ho5-15I#G!SZ%u8^b#P#?o
zB&|(=BnS|-l8h*&5)eKMR;`dXMHRmVJH&<sl94KvE?PiH2-F3L1^2o%VV>TZd(NHT
znYmZ{WM9w2Ua!uu{di$(;(9M*SBczeDh7S{mmIL!GXqVV8?luQ5Q=H6vUG6CGX2<x
z%n;Y}ia2iux5FPWVAwZNU#w!rjhQdF#|&m74emw$9rx{UKl01m*x`Y^LsZRX9yD9b
z&?@jyl<{ygTUBsGYq2`&WE_TBGE(b;6!dQ4;Y^kW&e948uB@@NjoY}2y~?||lWS{`
zw(~o<i|ZIUc(;5@nRMU+d+KhPh=psdwl5vVIbgVKMdeDxz5z>b$m_10_m8qt*4!+w
zqT^|KTpw6jvh-C}(aSn_;;DZrvu!u|<XXjklr4;)?n3=<u3MgrYoQ-Gy2sfb?rA9d
zQ9=Kx#JR7b+=hxj??9!`@^ZuSm38zSK+i$)TxJ>nC@U_i%rf%&5DuFJ+z^-*m<?`+
zX!9{lKa2k;E923{iKDEna%gPw5?3qgf)Bac;MImjTSX~)Mj2;#2_bo>yE|Hk(#*y9
z`max2d@ogp`I%GU^M|gST*G);ZnpOtKU0CsoO_4bXQ^aZ4!IwVdrDSeDxa}(Q+ZQ}
zeK?|SpPnmZEzyCo{K)+w49R}a-hirTpn<;g$7&}%F9Lil|MGqf&&f-^fwp5fLmVf_
z5KItc2_|LS-ws?p=)WB<$O->fkdvK8#3_a;J1h?x6EG{^H`-xder_CuOSOND5%A_I
zJByH1L{VmfEg<AlFlo$@K2H!OD9BHPN$(7XY5PM%Lr;#1S$QpJ!nd`-&|LsO$>lJI
zMR_?~hAVQs=?DAMIP|yLeUUMUh!I-BBzT@+nc!vlNpsx0f??fWva-Swr{wp|>u^Jk
zwY&@CawFE}_wron#9VfH5N|5C6sRRy?T}id+1)hHHdR`zJA|3#c&qo4yxv%DYOYW+
zlTOh^(qV+O?UCV;x=j>b5U<I}w!QXOP>jg4Z8zYwtVTK9E&q&e!IpeAw%>gi>$~K@
z0ZftK#5(0bd=G?VG5)~)<EZ`5MuF%}FBFks@g~7(0@^~HA$VI}i+8RhFvQ1=Xf8df
zd-Rm%);wB3YeLktm}b|SwWtW<pt_dH%x7~8nM@sqML#M#1t$&>yH#=xYyUATmDI%m
zX2oL!M+hD#7$kTCi_Gb7>Y?Yu_Is*P6T4Lk{mC{#g)3YH$K*su4^-vr9S4$UNqC09
oN3iQJL6l1Q=IeGyXQCSp$a@m8_I<j|p()_NGR9)I5$=Bf0^{*ex&QzG

diff --git a/api_caller.py b/api_caller.py
new file mode 100644
index 0000000..07f8d8b
--- /dev/null
+++ b/api_caller.py
@@ -0,0 +1,45 @@
+import finnhub
+import time
+import csv
+
+APIkey = "c24qddqad3ickpckgg80"
+sandboxAPIkey = "sandbox_c24qddqad3ickpckgg8g"
+finnhubClient = finnhub.Client(api_key=APIkey)
+
+def getStockPrices():
+    apiCalledError = False
+    stock_info = []
+    
+    symbols = []
+    f = open('csv/tickers.csv', 'r')
+    CSV = csv.reader(f)
+    
+    for row in CSV:
+        symbol = row[0]
+        symbols.append(symbol)
+    f.close()
+    try:
+        quotes = [finnhubClient.quote(symbol) for symbol in symbols]
+        current_prices = [quote['c'] for quote in quotes]
+        opening_prices = [quote['o'] for quote in quotes]
+        
+        CSV = open('csv/tickers.csv', 'w+')
+        for i, symbol in enumerate(symbols):
+            symbol + ',' + str(current_prices[i]) + ',' +  str(opening_prices[i]) + '\n'
+            CSV.write(symbol + ',' + str(current_prices[i]) + ',' +  str(opening_prices[i]) + '\n')
+        CSV.close()
+        print('API called successfully')
+            
+        
+    except Exception as e:
+        print("Could not fetch data - API CALLS REACHED? - Will display old image")
+        print(e)
+        apiCalledError = True
+    return stock_info, apiCalledError
+    
+    
+if __name__ == '__main__':
+    sleeptime = 2 #minutes
+    while True:
+        getStockPrices()
+        time.sleep(sleeptime*60)
diff --git a/csv/settings.csv b/csv/settings.csv
new file mode 100644
index 0000000..170284b
--- /dev/null
+++ b/csv/settings.csv
@@ -0,0 +1 @@
+f,9
\ No newline at end of file
diff --git a/csv/tickers.csv b/csv/tickers.csv
index 5cb9893..72c26a9 100644
--- a/csv/tickers.csv
+++ b/csv/tickers.csv
@@ -1,20 +1,20 @@
-MSFT,248.515,249.06
-NFLX,503.82,504.99
-GOOG,2370,2368.42
-TSLA,679.15,681.06
-AAPL,129.681,129.2
-INTC,56.995,56.96
-TXN,182.05,181.01
-HPQ,34.155,34.24
-HOG,48.61,48.33
-LUV,61.255,60.77
-WMT,140.61,140.71
-BJ,44.9502,45.17
-ETSY,187.4508,190.99
-G,46.86,47.25
-GDDY,82.7339,83.24
-GNRC,316.745,318.9
-PEP,143.83,143.715
+MSFT,248.15,249.06
+NFLX,502.34,504.99
+GOOG,2366.54,2368.42
+TSLA,676.818,681.06
+AAPL,129.675,129.2
+INTC,56.94,56.96
+TXN,182.07,181.01
+HPQ,34.315,34.24
+HOG,49.62,48.33
+LUV,61.46,60.77
+WMT,140.6,140.71
+BJ,45.18,45.17
+ETSY,187.8,190.99
+G,47.02,47.25
+GDDY,82.985,83.24
+GNRC,320.425,318.9
+PEP,143.65,143.715
 STMYELP,0,0
-XRAY,67.405,68.92
-ZTS,173.086,174.2
+XRAY,67.68,68.92
+ZTS,172.4995,174.2
diff --git a/final.ppm b/final.ppm
index a5bc1080e03528e962d1d3b21d80a1b409a75043..df47240c63fb0b8ce7224756487738fcbd30817f 100755
GIT binary patch
delta 11579
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

delta 11854
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

diff --git a/server.py b/server.py
index 876dbde..fbdf429 100644
--- a/server.py
+++ b/server.py
@@ -46,13 +46,15 @@ def process_file(path, filename):
     for row in new_csv:
         default_csv.writerow(row)
 
-
+    
     
 
 app = Flask(__name__)
 @app.route("/", methods=['GET', 'POST'])
 def hello():
    global command
+   
+   
    now = datetime.datetime.now()
    timeString = now.strftime("%Y-%m-%d %H:%M")
    LogoList = os.listdir('logos')
@@ -88,10 +90,20 @@ def Delay():
 
 @app.route("/Speed", methods=['POST'])
 def Speed():
-    global speedTime
-    speedTime = request.form['text']
-    print(speedTime)
-    ticker.sendline(speedTime)
+    global speed
+    speed = request.form['text']
+    print(speed)
+    ticker.sendline(speed)
+    
+    f = open('csv/settings.csv', 'r')
+    CSV = csv.reader(f)
+    for line in CSV:
+        _, brightness = line 
+    f.close()
+    
+    f = open('csv/settings.csv', 'w+')
+    f.write(str(speed) + ',' + brightness)
+    f.close()
     global LastCommand
     LastCommand = 'Change Speed'
     return hello()
@@ -102,6 +114,17 @@ def Brightness():
     brightness = int(request.form['text'])-1
     print(brightness)
     ticker.sendline(str(brightness))
+    
+    f = open('csv/settings.csv', 'r')
+    CSV = csv.reader(f)
+    for line in CSV:
+        speed, _ = line 
+    f.close()
+    
+    f = open('csv/settings.csv', 'w+')
+    f.write(str(speed) + ',' + str(brightness))
+    f.close()
+    
     global LastCommand
     LastCommand = 'Change Brightness'
     return hello()
diff --git a/stockTicker.py b/stockTicker.py
index 56ed695..7d0485c 100644
--- a/stockTicker.py
+++ b/stockTicker.py
@@ -136,14 +136,7 @@ class StockTicker():
                         kill = True
                         break
                 
-                    elif msg == 's':
-                        stock_ticker.delay = 0.03
-                    elif msg == 'm':
-                        stock_ticker.delay = 0.01
-                    elif msg == 'f':
-                        stock_ticker.delay = 0.005
-                    elif msg in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
-                        self.brightness = min(1.0, float(msg)/10 + 0.1)
+                    self.process_msg(msg)
                 
     
                 except KeyboardInterrupt:
@@ -326,16 +319,50 @@ class StockTicker():
 
     #Change running to false stopping refresh at next checkpoint
     def stopStockTicker(self):
+    
      
         self.keySwapper = 0
         self.running = False
         print('MATRIX DISPLAY STOP CALLED')
     
+    def process_msg(self, msg):
+        
+        if msg == 'S':
+            self.getFullStockImage()
+            self.displayMatrix()
+            
+
+        elif msg == 's':
+            self.delay = 0.03
+  
+        elif msg == 'm':
+            self.delay = 0.01
+ 
+        elif msg == 'f':
+            self.delay = 0.005
+        
+        elif msg in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
+      
+            self.brightness = min(1.0, float(msg)/10 + 0.1)
        
 if __name__ == '__main__':
     
     #print(sys.stdin.readlines())
     stock_ticker = StockTicker()
+    
+    f = open('csv/settings.csv')
+   
+    CSV = csv.reader(f)
+
+    for row in CSV:
+       speed, brightness = row
+       
+    print(speed, brightness)
+    stock_ticker.process_msg(brightness)
+    stock_ticker.process_msg(speed)
+    
+    print(stock_ticker.delay, stock_ticker.brightness)
+    
     #t = time.time()
     #api_caller = pexpect.spawn("sudo -E python3 api_caller.py")
     #print('time to call api', time.time()-t)
@@ -345,19 +372,7 @@ if __name__ == '__main__':
     
     while True:
         msg = getInput()
-        if msg == 'S':
-            stock_ticker.getFullStockImage()
-            stock_ticker.displayMatrix()
-            
-        
-        elif msg == 's':
-            stock_ticker.delay = 0.03
-        elif msg == 'm':
-            stock_ticker.delay = 0.01
-        elif msg == 'f':
-            stock_ticker.delay = 0.005
-        elif msg in ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9']:
-            stock_ticker.brightness = min(1.0, float(msg)/10 + 0.1)
+        stock_ticker.process_msg(msg)
         
     
 
diff --git a/templates/index.html b/templates/index.html
index ae8b6f4..5cd6731 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -7,23 +7,17 @@
    <body>
       <center>
       <h2>Stock Ticker Control Panel</h2>
-      <h3>Time of last page reload <br> {{ time }}</h3>
-      <hr width=70% size=3 noshade>
-      <p>Last command sent: {{ lastcommand }}</p>
-      <br>
 
-      <h3>Runtime: {{ runtime }}s & API call: {{ delay }}s before refresh <br> displayed at a speed of {{ speedtime }}m/s</h3>
-      <p>Set the amount of time each image is displayed before a refresh in seconds</p>
-      <form action="/Runtime" method="POST">
-        <input name="text" placeholder="300"style="height:24px">
-        <input type="submit" value="Runtime"style="height:30px">
+      <br><br>
+      <form action="/matrix" method="POST">
+        <input type="submit" name="Run Display" value="Run Display" style="height:50px" >
+        <input type="submit" name="Stop Display (at next refresh)" value="Stop Display"style="height:50px">
+        <input type="submit" name="Shutdown the pi" value="Shutdown the pi"style="height:50px">
       </form>
-      <p>Set the amount of time before next image refresh that the stocks are updated</p>
-      <form action="/Delay" method="POST">
-        <input name="text" placeholder="20"style="height:24px">
-        <input type="submit" value="Delay"style="height:30px">
-      </form>
-      <p>Set the speed the image scrolls across the screen (s, m of f for slow, medium or fast)</p>
+      <br><br>
+      <br><br>
+      
+       <p>Set the speed the image scrolls across the screen (s, m of f for slow, medium or fast)</p>
       <form action="/Speed" method="POST">
         <input name="text" placeholder="m"style="height:24px">
         <input type="submit" value="Speed"style="height:30px">
@@ -34,7 +28,7 @@
         <input name="text" placeholder="10"style="height:24px">
         <input type="submit" value="Brightness"style="height:30px">
       </form>
-
+      
       <br><br>
       <h3>Tickers to display</h3>
       <p>To change the tickers displayed please upload a CSV (comma separated value) file with 11 tickers on each row e.g</p>
@@ -44,7 +38,7 @@
         <p><input type=file name=file style="height:30px">
           <input type=submit value=Upload style="height:30px">
       </form>
-
+      
       <br><br>
       <h3>Logos</h3>
       <p>Upload logo images (e.g "TICKER.png") or change the default images here</p>
@@ -57,18 +51,6 @@
           <input type=submit value=Upload style="height:30px">
       </form>
       
-
-      <br><br>
-      <form action="/matrix" method="POST">
-        <input type="submit" name="Run Display" value="Run Display" style="height:50px" >
-        <input type="submit" name="Stop Display (at next refresh)" value="Stop Display (at next refresh)"style="height:50px">
-        <input type="submit" name="Shutdown the pi" value="Shutdown the pi"style="height:50px">
-      </form>
-      <br><br>
-      <br><br>
-      
-      <p>Logos currently in file:</p>
-      <p>{{ logofiles }}</p>
       </center>
    </body>
 </html>