From 8319aefe1cd91d0535e82629c7d13687f220e722 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 25 Sep 2022 05:29:38 +0200 Subject: [PATCH 1/4] get it ready for pcm --- files/classes/streamers.py | 2 +- files/helpers/cron.py | 2 +- files/routes/static.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/classes/streamers.py b/files/classes/streamers.py index a98ce13ad2..5754817855 100644 --- a/files/classes/streamers.py +++ b/files/classes/streamers.py @@ -1,6 +1,6 @@ from files.helpers.const import SITE -if SITE == 'pcmemes.net' or True: +if SITE == 'pcmemes.net': from sqlalchemy import * from files.__main__ import Base diff --git a/files/helpers/cron.py b/files/helpers/cron.py index b7f4265d47..d472540c63 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -31,7 +31,7 @@ def cron(every_5m, every_1h, every_1d, every_1mo): lottery.check_if_end_lottery_task() spin_roulette_wheel() offsitementions.offsite_mentions_task() - if SITE == 'pcmemes.net' or True: + if SITE == 'pcmemes.net': x = route_static.live_cached() cache.set('live', x[0]) cache.set('offline', x[1]) diff --git a/files/routes/static.py b/files/routes/static.py index 11d26af1ff..253d771946 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -436,7 +436,7 @@ def donate(v): return render_template(f'donate_{SITE_NAME}.html', v=v) -if SITE == 'pcmemes.net' or True: +if SITE == 'pcmemes.net': from files.classes.streamers import * live_regex = re.compile('playerOverlayVideoDetailsRenderer":\{"title":\{"simpleText":"(.*?)"\},"subtitle":\{"runs":\[\{"text":"(.*?)"\},\{"text":" • "\},\{"text":"(.*?)"\}', flags=re.A) @@ -451,7 +451,7 @@ if SITE == 'pcmemes.net' or True: db.close() for x in streamers: url = f'https://www.youtube.com/channel/{x}/live' - req = requests.get(url, cookies={'CONSENT': 'YES+1'}) + req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) txt = req.text if '"videoDetails":{"videoId"' in txt: t = live_thumb_regex.search(txt) @@ -499,7 +499,7 @@ if SITE == 'pcmemes.net' or True: send_repeatable_notification(KIPPY_ID, f"@{v.username} has added a [new YouTube channel](https://www.youtube.com/channel/{streamer.id})") url = f'https://www.youtube.com/channel/{id}/live' - req = requests.get(url, cookies={'CONSENT': 'YES+1'}) + req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) txt = req.text if '"videoDetails":{"videoId"' in txt: t = live_thumb_regex.search(txt) From 8ce942dcc0c86c84a617363b1ce8d837b768a065 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 25 Sep 2022 05:34:28 +0200 Subject: [PATCH 2/4] testing on devrama --- files/routes/static.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index 253d771946..d0a9c8a245 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -452,17 +452,17 @@ if SITE == 'pcmemes.net': for x in streamers: url = f'https://www.youtube.com/channel/{x}/live' req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) - txt = req.text - if '"videoDetails":{"videoId"' in txt: - t = live_thumb_regex.search(txt) - y = live_regex.search(txt) + text = req.text + if '"videoDetails":{"videoId"' in text: + t = live_thumb_regex.search(text) + y = live_regex.search(text) try: count = int(y.group(3)) live.append((x, req.url, t.group(1), y.group(2), y.group(1), count)) except: print(x) else: - y = offline_regex.search(txt) + y = offline_regex.search(text) try: offline.append((x, req.url.rstrip('/live'), y.group(2), y.group(1))) except: print(x) @@ -500,10 +500,10 @@ if SITE == 'pcmemes.net': url = f'https://www.youtube.com/channel/{id}/live' req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) - txt = req.text - if '"videoDetails":{"videoId"' in txt: - t = live_thumb_regex.search(txt) - y = live_regex.search(txt) + text = req.text + if '"videoDetails":{"videoId"' in text: + t = live_thumb_regex.search(text) + y = live_regex.search(text) try: count = int(y.group(3)) live.append((id, req.url, t.group(1), y.group(2), y.group(1), count)) @@ -511,7 +511,10 @@ if SITE == 'pcmemes.net': except: print(id, flush=True) else: - y = offline_regex.search(txt) + with open("files/assets/txt8.txt", "w", encoding='utf_8') as f: + f.write(text) + make_response(send_from_directory('assets', 'txt8.txt')) + y = offline_regex.search(text) try: offline.append((id, req.url.rstrip('/live'), y.group(2), y.group(1))) cache.set('offline', offline) From a83821ebdb7efb9f4e3c931747b73f41106b4f54 Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 25 Sep 2022 05:36:11 +0200 Subject: [PATCH 3/4] testin on devrama --- files/classes/streamers.py | 2 +- files/helpers/cron.py | 2 +- files/routes/static.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/classes/streamers.py b/files/classes/streamers.py index 5754817855..a98ce13ad2 100644 --- a/files/classes/streamers.py +++ b/files/classes/streamers.py @@ -1,6 +1,6 @@ from files.helpers.const import SITE -if SITE == 'pcmemes.net': +if SITE == 'pcmemes.net' or True: from sqlalchemy import * from files.__main__ import Base diff --git a/files/helpers/cron.py b/files/helpers/cron.py index d472540c63..b7f4265d47 100644 --- a/files/helpers/cron.py +++ b/files/helpers/cron.py @@ -31,7 +31,7 @@ def cron(every_5m, every_1h, every_1d, every_1mo): lottery.check_if_end_lottery_task() spin_roulette_wheel() offsitementions.offsite_mentions_task() - if SITE == 'pcmemes.net': + if SITE == 'pcmemes.net' or True: x = route_static.live_cached() cache.set('live', x[0]) cache.set('offline', x[1]) diff --git a/files/routes/static.py b/files/routes/static.py index d0a9c8a245..336eee2543 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -436,7 +436,7 @@ def donate(v): return render_template(f'donate_{SITE_NAME}.html', v=v) -if SITE == 'pcmemes.net': +if SITE == 'pcmemes.net' or True: from files.classes.streamers import * live_regex = re.compile('playerOverlayVideoDetailsRenderer":\{"title":\{"simpleText":"(.*?)"\},"subtitle":\{"runs":\[\{"text":"(.*?)"\},\{"text":" • "\},\{"text":"(.*?)"\}', flags=re.A) @@ -451,7 +451,7 @@ if SITE == 'pcmemes.net': db.close() for x in streamers: url = f'https://www.youtube.com/channel/{x}/live' - req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) + req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5) text = req.text if '"videoDetails":{"videoId"' in text: t = live_thumb_regex.search(text) @@ -499,7 +499,7 @@ if SITE == 'pcmemes.net': send_repeatable_notification(KIPPY_ID, f"@{v.username} has added a [new YouTube channel](https://www.youtube.com/channel/{streamer.id})") url = f'https://www.youtube.com/channel/{id}/live' - req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5, proxies=proxies) + req = requests.get(url, cookies={'CONSENT': 'YES+1'}, timeout=5) text = req.text if '"videoDetails":{"videoId"' in text: t = live_thumb_regex.search(text) From 9ebea2c6e98ded4e5c70bd3a1299cf9ab089d33f Mon Sep 17 00:00:00 2001 From: Aevann1 Date: Sun, 25 Sep 2022 05:36:54 +0200 Subject: [PATCH 4/4] fix --- files/routes/static.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/routes/static.py b/files/routes/static.py index 336eee2543..1052de06af 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -513,7 +513,7 @@ if SITE == 'pcmemes.net' or True: else: with open("files/assets/txt8.txt", "w", encoding='utf_8') as f: f.write(text) - make_response(send_from_directory('assets', 'txt8.txt')) + return make_response(send_from_directory('assets', 'txt8.txt')) y = offline_regex.search(text) try: offline.append((id, req.url.rstrip('/live'), y.group(2), y.group(1)))