From 88005c1da1856f0cbe5cb340f63dd0cf4335b3db Mon Sep 17 00:00:00 2001
From: Death916 <mail@trentnelson.dev>
Date: Sun, 9 Feb 2025 00:34:01 -0800
Subject: [PATCH] refactor and adding alarm sound

---
 deathclock/__pycache__/news.cpython-311.pyc   | Bin 2823 -> 4980 bytes
 .../__pycache__/weather.cpython-311.pyc       | Bin 2495 -> 2495 bytes
 deathclock/app.py                             |  33 +++++--
 deathclock/news.py                            |  93 ++++++++++++------
 4 files changed, 88 insertions(+), 38 deletions(-)

diff --git a/deathclock/__pycache__/news.cpython-311.pyc b/deathclock/__pycache__/news.cpython-311.pyc
index 38dcdd0f83307a679aefcf719df0c50760addad7..bf3d0ad9fd61ef88e0c5762225d87e9b2c611584 100644
GIT binary patch
literal 4980
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

delta 1668
zcmeyO)-J}koR^o2fq{V`C3SInDBDCn2}ZYx>T2@LEeuhtObqS}DJ(4vDXhzw7#LPF
zfz*L;6x+rUK1N2C$<2(_Tp&?q1_p-DN|QO56m?S=f*CZK{E9%rnoPI2;`36=i{n!=
zlS^(1BG~acsd?!o8I$KR>9BDyFfbI0Prkq;qIrQs?gEEg5lAGN5o8k-g9N~KoMK{N
zn9fkbIPtv1WHV-^$x+N1Mm3Bs3=<e**=w0gIHBqp7#OlxVeA^_WsD3AtKsI=vP>>u
z5ocz};+XhWqP~VD3uHQ2aSB5UYb%o^m<=La7-EmtveqzUfjk2eU`S!j2Af;NUBi$C
zH!+!skpYB*8EROv;BLqQhbu^14Qm!Rhz8*rRuu7i9*`gir?AaoK{gawp$!8ALk&X(
zBa%bdt9Th0l9}S+PAg#tnF7Hn94VZrQD(|e%Tyu_kp+=3o7g~{1$>haa*9lTz`>`1
z8dND<DGX=<B2~*)!?b`Oq(P>JZ8k#+_gp4aO^ggZ(wq#Fr!eb@^_-Z%*ux343uIL=
zgC@`9HqM>(!k}1JU|?WqV7MS+06_~<CWK6nniMrLW=af1<bsF+I5oT!VPIg;WVyvw
zoL^d$oO+9=pfo8bvp6F@C9x#+7Dq;EVoFYCUg|CO;?msQ#G=ZVptz~x0Hr;>l8TaB
zjOCec{{R2~i;+uHpa>K%^+kLP3=Bp53=9mnSn>-}^KNmarKYA7Bo-B?7Tsb6)3?})
z67y2>b8oR1XOyO;<)q$XPt7YS%1kZ3#R5`%i?t-PBq#M2C)6>iDMhki^KvqaOK!1b
zr&bo<Vl6MqEJ@X5FA@OBu!6J|-(pNF5?2TD8B=bt6yz6|6v==>0~CRiPxGj<gVIDX
zC)4EbJc{*Cc?BnE&nUjgt9*r5`2zzZr{RLa8{hz2k$6GG;G&4Z6%m6D*AL8$oQ7a&
zF!2$j@C%3lb8!+se*C~H$H5>f^?^a0)3E*{i0p8=D<E}6Kw*K%MFF)d0%{$OPkDrT
z{AL)=vAoEmdWA>z0*~qk4hBi7Ih+fW7Z@#2p2PQnL4el~OiW<8AuN7HSaU_tC1L#w
z!umI)<>%O65Ya+LAJ`b=73QSP$+@ATvBd9&g31!E8}iC?YChC+vg!+cU|`i3n!qxJ
ze*w!9u8RWNA9xr9MK6F|vO@8qfHs8rm4iV{YKGQ=<cp$OS46cwFfa)ku1LJAqOn3`
zjr?^@+e@0Z7d7p#Xxd*?ak!%5a6tHg$N`ZnDsCSb7)3!rCu%r@<A#LfeD+!F3oI7!
zgWyGpdV?zx1{c8S12ae+Gn1ep*k~~E5oF015CP`mB*5W}q7$t2$46OED5)_Bi1gH7
z;E*d;VPIfb&+Ev+e2|01k%#>tzc`~K5Bp(DM=n<Z_M-wUt|Ht=#Ti{ixF<6UX|M@`
zlCa@qLm`<sP}(Ur0%xZN1_=DX#KfxnfdNi%sIba^V8A568LSAD<}}%hlt9Unr6e;q
zwFp$;7O{Y=P?@|{NS(`!fq?;(t%{2$KNB)_`@qD=X!3ypPOxb*%70+MBtC+~zJLfc
HS+KnTWqFtx

diff --git a/deathclock/__pycache__/weather.cpython-311.pyc b/deathclock/__pycache__/weather.cpython-311.pyc
index 8740926f4e2c3cd8315ccfeb4f8849e9aa9ae7c2..8a03d24a95b8f63b2d192811495a24995dc485cd 100644
GIT binary patch
delta 20
ccmdllykD4mIWI340|NuYF{Wi3xwmiv06267VgLXD

delta 20
ccmdllykD4mIWI340|NuYJ?lvuxwmiv06Go@p8x;=

diff --git a/deathclock/app.py b/deathclock/app.py
index f106822..ec25be8 100644
--- a/deathclock/app.py
+++ b/deathclock/app.py
@@ -13,6 +13,7 @@ weather_obj = Weather()
 news_obj = News()
 scores_obj = NBAScores()
 alarm_obj = alarm.Alarm()
+_alarm_time = None
 
 # Uses arbitrary date in the past as initial value
 _last_news_update = datetime.datetime(2000, 1, 1)
@@ -39,7 +40,8 @@ app.layout = html.Div([
             html.Div(id='weather-display')
         ], id='scores-weather-container'),
     ]),
-    html.Div(id='news-ticker', className='ticker'),
+    #add class back if not working still
+    html.Div(id='news-ticker'),
     # Intervals
     dcc.Interval(id='clock-interval', interval=60000, n_intervals=0),
     dcc.Interval(id='weather-interval', interval=150000, n_intervals=0),
@@ -77,6 +79,8 @@ def toggle_time_input(n_clicks, current_style):
 def process_selected_time(time_value):
     if time_value:
         # Here you can pass time_value to another function if desired.
+        global alarm_time
+        alarm_time = time_value
         alarm_obj.add_alarm(time_value, datetime.datetime.now())
         return f'Alarm time: {time_value}'
     return 'No time selected yet.'
@@ -108,15 +112,18 @@ def update_news(n):
     global _last_news_update, _cached_news, _initial_run
     current_time = datetime.datetime.now()
     try:
+        print("UPDATING NEWS...")
         headlines_dict = news_obj.get_news()
-        combined_text = " | ".join(headlines_dict.keys())
-        text_px = len(combined_text) * 8  # Approximate 8px per character
-        scroll_speed = 75  # pixels per second
-        duration = text_px / scroll_speed  # seconds required to scroll across
-        if duration < 20:
-            duration = 20
+        # Combine source and headline for each news item
+        combined_items = " | ".join([f"{data['source']}: {headline}" 
+                                   for headline, data in headlines_dict.items()])
+        
+        text_px = len(combined_items) * 8
+        scroll_speed = 75
+        duration = max(text_px / scroll_speed, 20)
+        
         ticker_style = {"animationDuration": f"{duration}s"}
-        combined_items = " | ".join([f"{headline}" for headline in headlines_dict.keys()])
+        
         _cached_news = html.Div(
             html.Span(combined_items, className="news-item", style=ticker_style),
             className='ticker'
@@ -124,6 +131,7 @@ def update_news(n):
         _last_news_update = current_time
         _initial_run = False
         return _cached_news
+        
     except Exception as e:
         if _cached_news:
             return _cached_news
@@ -153,6 +161,15 @@ def update_scores(n):
     except Exception as e:
         return html.Div("Scores unavailable")
 
+# Check for alarms and play sound if triggered
+def check_alarms():
+    trigg = alarm_obj.check_alarm()
+    if trigg:
+        print("ALARM TRIGGERED!")
+        # Play alarm sound here using dash audio component
+check_alarms()
+
+
 
 if __name__ == '__main__':
     app.run_server(debug=False, host='0.0.0.0', port=8050)
diff --git a/deathclock/news.py b/deathclock/news.py
index 4290a55..7843a1a 100644
--- a/deathclock/news.py
+++ b/deathclock/news.py
@@ -1,6 +1,8 @@
 import feedparser
 from time import localtime, strftime
 import random
+import socket
+
 def print_time():
     print(strftime("%B %d, %I:%M %p", localtime()))
 
@@ -8,41 +10,72 @@ class News:
     def __init__(self):
         self._news_dict = {}
         self._news_dict_length = 0
+        # Set timeout for feed fetching
+        socket.setdefaulttimeout(10)
         
     def get_news(self):
         print_time()
         feeds = []
-        self._news_dict = {}  # Reset dict each time
+        self._news_dict = {}
         self._news_dict_length = 0
-        # Load RSS feed list
-        with open("feeds.txt", "r") as f:
-            feeds = [line.strip() for line in f]
-            
-        # Get latest news from each feed
+        
+        try:
+            with open("feeds.txt", "r") as f:
+                feeds = [line.strip() for line in f]
+        except Exception as e:
+            print(f"Error reading feeds.txt: {e}")
+            return {}
+        
+        all_entries = []
+        print("Getting news entries...")
+        
         for feed in feeds:
-            d = feedparser.parse(feed)
-            #randomly select 20 news items
-            random.shuffle(d.entries)
-            #its getting all posts from first feed because there is more than 20
+            try:
+                feed_entries = []
+                print(f"Fetching from feed: {feed}")  # Debug print
+                d = feedparser.parse(feed)
+                
+                if hasattr(d, 'status') and d.status != 200:
+                    print(f"Skip feed {feed}: status {d.status}")
+                    continue
+                    
+                for post in d.entries:
+                    feed_entries.append({
+                        'title': post.title,
+                        'source': d.feed.title if hasattr(d.feed, 'title') else 'Unknown',
+                        'publish_date': post.published if hasattr(post, 'published') else '',
+                        'summary': post.summary if hasattr(post, 'summary') else ''
+                    })
+                
+                if feed_entries:
+                    selected = random.sample(feed_entries, min(10, len(feed_entries)))
+                    all_entries.extend(selected)
+                    print(f"Added {len(selected)} entries from {feed}")  # Debug print
+                
+                if len(all_entries) >= 30:
+                    break
+                    
+            except Exception as e:
+                print(f"Error processing feed {feed}: {e}")
+                continue
+        
+        if not all_entries:
+            print("No entries collected")
+            return {}
             
-            
-            for post in d.entries[:20]:  # Limit to 20 entries per feed
-                if self._news_dict_length >= 20:  # Max 20 total entries
-                    return self._news_dict
-                
-                self._news_dict[post.title] = {
-                    'source': d.feed.title,
-                    'publish_date': post.published,
-                    'headline': post.title,
-                    'summary': post.summary
-                }
-                self._news_dict_length += 1
-                # Store last 20 news items in text file
-
-                
-                with open("news.txt", "w") as f:
-                    for headline in list(self._news_dict.keys())[-20:]:
-                        f.write(f"{headline}\n")
-
-                
+        if len(all_entries) > 30:
+            all_entries = random.sample(all_entries, 30)
+        
+        for entry in all_entries:
+            self._news_dict[entry['title']] = entry
+        
+        try:
+            with open("news.txt", "w") as f:
+                print("Writing news to file...")
+                for entry in self._news_dict.values():
+                    f.write(f"[{entry['publish_date']}] {entry['source']}: {entry['title']}\n")
+                    f.flush()
+        except Exception as e:
+            print(f"Error writing to news.txt: {e}")
+        
         return self._news_dict