From 226708d9c5d03df512b1cadacc8f75cf281c6cc5 Mon Sep 17 00:00:00 2001
From: David <59258980+zerodytrash@users.noreply.github.com>
Date: Thu, 31 Mar 2022 02:14:56 +0200
Subject: [PATCH] cleanup

---
 .gitignore                                       |  2 +-
 analysis.py                                      | 16 ++++++++--------
 innerbrute.py                                    | 16 ++++++++--------
 .../client_versions.txt                          |  0
 post_data.txt => payloads/post_data.txt          |  2 +-
 working_clients.md => results/working_clients.md |  0
 .../working_clients.txt                          |  0
 7 files changed, 18 insertions(+), 18 deletions(-)
 rename client_versions.txt => payloads/client_versions.txt (100%)
 rename post_data.txt => payloads/post_data.txt (97%)
 rename working_clients.md => results/working_clients.md (100%)
 rename working_clients.txt => results/working_clients.txt (100%)

diff --git a/.gitignore b/.gitignore
index 9021e73..8c80a79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,4 +129,4 @@ dmypy.json
 .pyre/
 
 .old/*
-results/*
\ No newline at end of file
+responses/*
\ No newline at end of file
diff --git a/analysis.py b/analysis.py
index a101c46..260d56c 100644
--- a/analysis.py
+++ b/analysis.py
@@ -1,7 +1,4 @@
-from email import charset
-import mimetypes
-from os import listdir
-from urllib import response
+import os
 import json
 
 markdown = ""
@@ -10,7 +7,10 @@ markdown += "|-------------|----------------|-----------------|----------|\n"
 
 txt_output = ""
 
-files = listdir('results')
+if not os.path.exists('results'):
+    os.makedirs('results')
+
+files = os.listdir('responses')
 
 client_ids = []
 
@@ -26,7 +26,7 @@ for client_id in client_ids:
     client_files.sort(reverse=True) # highest version first 
 
     for client_file in client_files:
-        response_data_raw = open('results/' + client_file, 'r', encoding='utf-8').read()
+        response_data_raw = open('responses/' + client_file, 'r', encoding='utf-8').read()
         response_data = json.loads(response_data_raw)
 
         client_name = None
@@ -73,10 +73,10 @@ for client_id in client_ids:
 
         break
 
-f = open("working_clients.md", "w")
+f = open("results/working_clients.md", "w")
 f.write(markdown)
 f.close()
 
-f = open("working_clients.txt", "w")
+f = open("results/working_clients.txt", "w")
 f.write(txt_output)
 f.close()
\ No newline at end of file
diff --git a/innerbrute.py b/innerbrute.py
index 9c76377..8e0894f 100644
--- a/innerbrute.py
+++ b/innerbrute.py
@@ -1,8 +1,8 @@
 import requests
 import os
 
-client_versions = open("client_versions.txt", "r").readlines()
-data_template =  open("post_data.txt", "r").read()
+client_versions = open("payloads/client_versions.txt", "r").readlines()
+data_template =  open("payloads/post_data.txt", "r").read()
 
 headers = {
     "Origin": "https://www.youtube.com",
@@ -11,11 +11,11 @@ headers = {
     "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.74 Safari/537.36 Edg/99.0.1150.52"
 }
 
-if not os.path.exists('results'):
-    os.makedirs('resuls')
+if not os.path.exists('responses'):
+    os.makedirs('responses')
 
 
-for client_name_id in range(0, 100):
+for client_name_id in range(1, 100):
     for client_version in client_versions:
         client_version = client_version.replace("\n", "").replace("\r", "")
         if client_version == "":
@@ -23,17 +23,17 @@ for client_name_id in range(0, 100):
 
         try_id = str(client_name_id) + "_" + client_version
 
-        print(try_id)
+        print("Try ClientId: " + str(client_name_id) + " ClientVersion: " + str(client_version))
 
         data = data_template.replace('%clientName%', str(client_name_id)).replace('%clientVersion%', client_version)
 
         try:
             response = requests.post("https://www.youtube.com/youtubei/v1/player?key=AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8", data=data, headers=headers, timeout=5)
 
-            print(response.status_code)
+            print("Response Code: " + str(response.status_code))
 
             if response.status_code == 200:
-                out = open("results/" + try_id + ".json", "w+", encoding="utf-8")
+                out = open("responses/" + try_id + ".json", "w", encoding="utf-8")
                 out.write(response.text)
                 out.close()
         except Exception as ex:
diff --git a/client_versions.txt b/payloads/client_versions.txt
similarity index 100%
rename from client_versions.txt
rename to payloads/client_versions.txt
diff --git a/post_data.txt b/payloads/post_data.txt
similarity index 97%
rename from post_data.txt
rename to payloads/post_data.txt
index 130c163..505dda8 100644
--- a/post_data.txt
+++ b/payloads/post_data.txt
@@ -25,7 +25,7 @@
             "consistencyTokenJars": []
         }
     },
-    "videoId": "d-u_7WV1Yl8",
+    "videoId": "xcJtL7QggTI",
     "playbackContext": {
         "contentPlaybackContext": {
             "currentUrl": "/watch?v=7t0SqerlBA0",
diff --git a/working_clients.md b/results/working_clients.md
similarity index 100%
rename from working_clients.md
rename to results/working_clients.md
diff --git a/working_clients.txt b/results/working_clients.txt
similarity index 100%
rename from working_clients.txt
rename to results/working_clients.txt