Update main.py

main.py

@@ -103,57 +103,48 @@ def proxy(url):
 @app.route('/')
 def index():
     id = request.args.get('id')
-    if 'current_feed' in session and request.args.get('new', 'false') == 'false':
-        feed = session['current_feed']
-        url = live_urls[int(feed)]
-    else:
+
+    if id is None:
         feed = random.randint(0, len(live_urls) - 1)
-        url = live_urls[int(feed)]
-        session['current_feed'] = feed
-    
-    if id:
-        url = live_urls[int(id)]
-        feed = id
-        session['current_feed'] = id
+        return redirect(f"/?id={feed}")  
 
-    url = encode_url(url)
-    url = url.replace('640x480','1280x960').replace('COUNTER','')
+    id = int(id)
+    url = live_urls[id]
+    session['current_feed'] = id
+
+    url = encode_url(url).replace('640x480','1280x960').replace('COUNTER','')
     
-    id = feed
     ip = ''.join(url.split('//')[-1]).split(':')[0]
     info = get_location(ip)
     country = info['country'].lower()
     name = (info['city'] + ", " + info['region']).lower()
     page_title = (info['city'] + ", " + info['region'] + ", " + country).lower()
     timezone = pytz.timezone(info['timezone'])
-    time = dt.datetime.now(timezone)
-    time = time.strftime("%I:%M:%S %p")
+    time = dt.datetime.now(timezone).strftime("%I:%M:%S %p")
     loc = info['loc']
     X, Y = latlon_to_pixel(info['loc'])
     proxy_url = 'proxy/' + url
-    logging.info(f"Generated proxy URL: {proxy_url}")
     loc_link = f"https://www.google.com/maps/search/{loc}"
     ip_link = url
-    try:
-        owner = owner_dict[ip]
-    except:
-        owner = 'unknown'
+    owner = owner_dict.get(ip, 'unknown')
+
     return render_template('index.html', 
-                               name=name, 
-                               url=encode_url(proxy_url), 
-                               info=info, 
-                               country=country, 
-                               time=time, 
-                               timezone=timezone,
-                               ip=ip, 
-                               ip_link=ip_link,
-                               loc=loc, 
-                               loc_link=loc_link, 
-                               owner=owner,
-                               X=X, 
-                               Y=Y,
-                               id=id,
-                               page_title=page_title)
+        name=name, 
+        url=encode_url(proxy_url), 
+        info=info, 
+        country=country, 
+        time=time, 
+        timezone=timezone,
+        ip=ip, 
+        ip_link=ip_link,
+        loc=loc, 
+        loc_link=loc_link, 
+        owner=owner,
+        X=X, 
+        Y=Y,
+        id=id,
+        page_title=page_title
+    )
 
 
 if __name__ == '__main__':