From 0705853d872e0b45a2f3484e68cd82e2679e523b Mon Sep 17 00:00:00 2001
From: Pinapelz <donaldshan1@outlook.com>
Date: Fri, 23 Jun 2023 15:24:55 -0700
Subject: fix: remove inactive hldex channels from ranking graph

---
 app.py       | 40 ++++++++++++++++++++++++++++++++++++++++
 nijitrack.py | 15 +++++++++++----
 server.py    | 40 ----------------------------------------
 3 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 app.py
 delete mode 100644 server.py

diff --git a/app.py b/app.py
new file mode 100644
index 0000000..d0bb231
--- /dev/null
+++ b/app.py
@@ -0,0 +1,40 @@
+"""
+Flask app for serving the static files
+"""
+from flask import Flask, request, send_file, send_from_directory, jsonify, abort
+from flask_cors import CORS
+
+app = Flask(__name__)
+CORS(app)
+
+@app.route('/')
+def main_page():
+    return send_from_directory('stats','index.html')
+
+@app.route('/stats/<path:path>')
+def send_static(path):
+    return send_from_directory('stats', path+".html")
+
+@app.route('/tables/<path:path>')
+def send_niji_table(path):
+    return send_from_directory('tables', path+".html")
+
+@app.route('/pettantracker')
+def send_pettan():
+    return send_file('/home/pinapelz/PettanTrack/index.html')
+
+@app.route('/pettantracker/stats/<path:path>')
+def send_pettan_stats(path):
+    return send_from_directory('/home/pinapelz/PettanTrack/stats', path+".html")
+
+@app.route('/pettantracker/tables/<path:path>')
+def send_table_pettan(path):
+    return send_from_directory('/home/pinapelz/PettanTrack/tables', path+".html")
+
+@app.route('/sitemap.xml')
+def send_sitemap():
+    return send_file('assets/sitemap.xml')
+
+@app.errorhandler(404)
+def not_found(error):
+    return jsonify(error=str(error)), 404
diff --git a/nijitrack.py b/nijitrack.py
index 20cc4c8..159c19f 100644
--- a/nijitrack.py
+++ b/nijitrack.py
@@ -82,7 +82,7 @@ def holodex_generation(server: SQLHandler):
     for organization in holodex_organizations:
         holodex.set_organization(organization)
         record_subscriber_data(holodex.get_subscriber_data())
-    return holodex.get_generated_channel_data()
+    return holodex.get_generated_channel_data(), holodex.get_inactive_channels()
 
 @log("Running YouTube Generation")
 def youtube_generation(server: SQLHandler):
@@ -93,11 +93,18 @@ def youtube_generation(server: SQLHandler):
     record_subscriber_data(data)
     return data
 
+def get_excluded_channel_ids(inactive_channel_data: list, excluded_channels: list):
+    channel_ids = []
+    for inactive_channel in inactive_channel_data:
+        if inactive_channel in excluded_channels:
+            continue
+        channel_ids.append(inactive_channel)
+    return channel_ids
+
 
 if __name__ == "__main__":
     server = SQLHandler(CONFIG["SQL"]["host"], CONFIG["SQL"]["user"], CONFIG["SQL"]["password"], CONFIG["SQL"]["database"])
     initialize_database(server)
-    channel_data = holodex_generation(server) # channel_data = youtube_generation(server)
+    channel_data, inactive_channels = holodex_generation(server) # channel_data = youtube_generation(server)
     generate_individual_pages(server, channel_data)
-    builder.build_ranking_page(server, CONFIG)
-    
+    builder.build_ranking_page(server, CONFIG, get_excluded_channel_ids(inactive_channels, fs.get_excluded_channels()))
diff --git a/server.py b/server.py
deleted file mode 100644
index d0bb231..0000000
--- a/server.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""
-Flask app for serving the static files
-"""
-from flask import Flask, request, send_file, send_from_directory, jsonify, abort
-from flask_cors import CORS
-
-app = Flask(__name__)
-CORS(app)
-
-@app.route('/')
-def main_page():
-    return send_from_directory('stats','index.html')
-
-@app.route('/stats/<path:path>')
-def send_static(path):
-    return send_from_directory('stats', path+".html")
-
-@app.route('/tables/<path:path>')
-def send_niji_table(path):
-    return send_from_directory('tables', path+".html")
-
-@app.route('/pettantracker')
-def send_pettan():
-    return send_file('/home/pinapelz/PettanTrack/index.html')
-
-@app.route('/pettantracker/stats/<path:path>')
-def send_pettan_stats(path):
-    return send_from_directory('/home/pinapelz/PettanTrack/stats', path+".html")
-
-@app.route('/pettantracker/tables/<path:path>')
-def send_table_pettan(path):
-    return send_from_directory('/home/pinapelz/PettanTrack/tables', path+".html")
-
-@app.route('/sitemap.xml')
-def send_sitemap():
-    return send_file('assets/sitemap.xml')
-
-@app.errorhandler(404)
-def not_found(error):
-    return jsonify(error=str(error)), 404
-- 
cgit v1.2.3