From b5f06437b6837803ef814aca8a158fb4bebe7690 Mon Sep 17 00:00:00 2001
From: FoxRefire <155989196+FoxRefire@users.noreply.github.com>
Date: Sun, 13 Oct 2024 06:56:35 +0900
Subject: [PATCH] Refactor: put external libraries in `libs` folder together

---
 jsonview.js => libs/jsonview.js                     |   0
 {pyodide => libs/pyodide}/package.json              |   0
 {pyodide => libs/pyodide}/pyodide-lock.json         |   0
 {pyodide => libs/pyodide}/pyodide.asm.js            |   0
 {pyodide => libs/pyodide}/pyodide.asm.wasm          | Bin
 {pyodide => libs/pyodide}/pyodide.js                |   0
 {pyodide => libs/pyodide}/pyodide.mjs               |   0
 {pyodide => libs/pyodide}/python_stdlib.zip         | Bin
 .../wheels}/certifi-2024.2.2-py3-none-any.whl       | Bin
 .../charset_normalizer-3.3.2-py3-none-any.whl       | Bin
 .../wheels}/construct-2.8.8-py2.py3-none-any.whl    | Bin
 {wheels => libs/wheels}/idna-3.6-py3-none-any.whl   | Bin
 .../wheels}/packaging-23.2-py3-none-any.whl         | Bin
 ...-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl | Bin
 ...me-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl | Bin
 .../wheels}/pymp4-1.4.0-py3-none-any.whl            | Bin
 .../wheels}/pyodide_http-0.2.1-py3-none-any.whl     | Bin
 .../wheels}/pywidevine-1.8.0-py3-none-any.whl       | Bin
 .../wheels}/requests-2.31.0-py3-none-any.whl        | Bin
 .../wheels}/urllib3-2.2.1-py3-none-any.whl          | Bin
 popup.html                                          |   4 ++--
 popup.js                                            |   2 +-
 22 files changed, 3 insertions(+), 3 deletions(-)
 rename jsonview.js => libs/jsonview.js (100%)
 rename {pyodide => libs/pyodide}/package.json (100%)
 rename {pyodide => libs/pyodide}/pyodide-lock.json (100%)
 rename {pyodide => libs/pyodide}/pyodide.asm.js (100%)
 rename {pyodide => libs/pyodide}/pyodide.asm.wasm (100%)
 rename {pyodide => libs/pyodide}/pyodide.js (100%)
 rename {pyodide => libs/pyodide}/pyodide.mjs (100%)
 rename {pyodide => libs/pyodide}/python_stdlib.zip (100%)
 rename {wheels => libs/wheels}/certifi-2024.2.2-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/charset_normalizer-3.3.2-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/construct-2.8.8-py2.py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/idna-3.6-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/packaging-23.2-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl (100%)
 rename {wheels => libs/wheels}/pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl (100%)
 rename {wheels => libs/wheels}/pymp4-1.4.0-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/pyodide_http-0.2.1-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/pywidevine-1.8.0-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/requests-2.31.0-py3-none-any.whl (100%)
 rename {wheels => libs/wheels}/urllib3-2.2.1-py3-none-any.whl (100%)

diff --git a/jsonview.js b/libs/jsonview.js
similarity index 100%
rename from jsonview.js
rename to libs/jsonview.js
diff --git a/pyodide/package.json b/libs/pyodide/package.json
similarity index 100%
rename from pyodide/package.json
rename to libs/pyodide/package.json
diff --git a/pyodide/pyodide-lock.json b/libs/pyodide/pyodide-lock.json
similarity index 100%
rename from pyodide/pyodide-lock.json
rename to libs/pyodide/pyodide-lock.json
diff --git a/pyodide/pyodide.asm.js b/libs/pyodide/pyodide.asm.js
similarity index 100%
rename from pyodide/pyodide.asm.js
rename to libs/pyodide/pyodide.asm.js
diff --git a/pyodide/pyodide.asm.wasm b/libs/pyodide/pyodide.asm.wasm
similarity index 100%
rename from pyodide/pyodide.asm.wasm
rename to libs/pyodide/pyodide.asm.wasm
diff --git a/pyodide/pyodide.js b/libs/pyodide/pyodide.js
similarity index 100%
rename from pyodide/pyodide.js
rename to libs/pyodide/pyodide.js
diff --git a/pyodide/pyodide.mjs b/libs/pyodide/pyodide.mjs
similarity index 100%
rename from pyodide/pyodide.mjs
rename to libs/pyodide/pyodide.mjs
diff --git a/pyodide/python_stdlib.zip b/libs/pyodide/python_stdlib.zip
similarity index 100%
rename from pyodide/python_stdlib.zip
rename to libs/pyodide/python_stdlib.zip
diff --git a/wheels/certifi-2024.2.2-py3-none-any.whl b/libs/wheels/certifi-2024.2.2-py3-none-any.whl
similarity index 100%
rename from wheels/certifi-2024.2.2-py3-none-any.whl
rename to libs/wheels/certifi-2024.2.2-py3-none-any.whl
diff --git a/wheels/charset_normalizer-3.3.2-py3-none-any.whl b/libs/wheels/charset_normalizer-3.3.2-py3-none-any.whl
similarity index 100%
rename from wheels/charset_normalizer-3.3.2-py3-none-any.whl
rename to libs/wheels/charset_normalizer-3.3.2-py3-none-any.whl
diff --git a/wheels/construct-2.8.8-py2.py3-none-any.whl b/libs/wheels/construct-2.8.8-py2.py3-none-any.whl
similarity index 100%
rename from wheels/construct-2.8.8-py2.py3-none-any.whl
rename to libs/wheels/construct-2.8.8-py2.py3-none-any.whl
diff --git a/wheels/idna-3.6-py3-none-any.whl b/libs/wheels/idna-3.6-py3-none-any.whl
similarity index 100%
rename from wheels/idna-3.6-py3-none-any.whl
rename to libs/wheels/idna-3.6-py3-none-any.whl
diff --git a/wheels/packaging-23.2-py3-none-any.whl b/libs/wheels/packaging-23.2-py3-none-any.whl
similarity index 100%
rename from wheels/packaging-23.2-py3-none-any.whl
rename to libs/wheels/packaging-23.2-py3-none-any.whl
diff --git a/wheels/protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl b/libs/wheels/protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl
similarity index 100%
rename from wheels/protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl
rename to libs/wheels/protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl
diff --git a/wheels/pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl b/libs/wheels/pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl
similarity index 100%
rename from wheels/pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl
rename to libs/wheels/pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl
diff --git a/wheels/pymp4-1.4.0-py3-none-any.whl b/libs/wheels/pymp4-1.4.0-py3-none-any.whl
similarity index 100%
rename from wheels/pymp4-1.4.0-py3-none-any.whl
rename to libs/wheels/pymp4-1.4.0-py3-none-any.whl
diff --git a/wheels/pyodide_http-0.2.1-py3-none-any.whl b/libs/wheels/pyodide_http-0.2.1-py3-none-any.whl
similarity index 100%
rename from wheels/pyodide_http-0.2.1-py3-none-any.whl
rename to libs/wheels/pyodide_http-0.2.1-py3-none-any.whl
diff --git a/wheels/pywidevine-1.8.0-py3-none-any.whl b/libs/wheels/pywidevine-1.8.0-py3-none-any.whl
similarity index 100%
rename from wheels/pywidevine-1.8.0-py3-none-any.whl
rename to libs/wheels/pywidevine-1.8.0-py3-none-any.whl
diff --git a/wheels/requests-2.31.0-py3-none-any.whl b/libs/wheels/requests-2.31.0-py3-none-any.whl
similarity index 100%
rename from wheels/requests-2.31.0-py3-none-any.whl
rename to libs/wheels/requests-2.31.0-py3-none-any.whl
diff --git a/wheels/urllib3-2.2.1-py3-none-any.whl b/libs/wheels/urllib3-2.2.1-py3-none-any.whl
similarity index 100%
rename from wheels/urllib3-2.2.1-py3-none-any.whl
rename to libs/wheels/urllib3-2.2.1-py3-none-any.whl
diff --git a/popup.html b/popup.html
index 66c7008..9c5c009 100644
--- a/popup.html
+++ b/popup.html
@@ -3,7 +3,7 @@
     <meta charset="UTF-8">
     <title>Widevine L3 Guessor 2024</title>
     <link rel="stylesheet" href="style.css">
-    <script src="pyodide/pyodide.js"></script>
+    <script src="libs/pyodide/pyodide.js"></script>
   </head>
   <body>
     <div id="toggleHistory">
@@ -83,7 +83,7 @@
   </body>
   <script src="popup.js" type="module"></script>
   <script src="popup_drawList.js"></script>
-  <script src="jsonview.js"></script>
+  <script src="libs/jsonview.js"></script>
   <script src="popup_showHistory.js"></script>
   <script src="popup_updateNotice.js"></script>
 </html>
diff --git a/popup.js b/popup.js
index 079d1ea..d1146fb 100644
--- a/popup.js
+++ b/popup.js
@@ -11,7 +11,7 @@ async function guess(){
 
     //Init Pyodide
     let pyodide = await loadPyodide();
-    await pyodide.loadPackage(["certifi-2024.2.2-py3-none-any.whl","charset_normalizer-3.3.2-py3-none-any.whl","construct-2.8.8-py2.py3-none-any.whl","idna-3.6-py3-none-any.whl","packaging-23.2-py3-none-any.whl","protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl","pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl","pymp4-1.4.0-py3-none-any.whl","pyodide_http-0.2.1-py3-none-any.whl","pywidevine-1.8.0-py3-none-any.whl","requests-2.31.0-py3-none-any.whl","urllib3-2.2.1-py3-none-any.whl"].map(e=>"wheels/"+e))
+    await pyodide.loadPackage(["certifi-2024.2.2-py3-none-any.whl","charset_normalizer-3.3.2-py3-none-any.whl","construct-2.8.8-py2.py3-none-any.whl","idna-3.6-py3-none-any.whl","packaging-23.2-py3-none-any.whl","protobuf-4.24.4-cp312-cp312-emscripten_3_1_52_wasm32.whl","pycryptodome-3.20.0-cp35-abi3-emscripten_3_1_52_wasm32.whl","pymp4-1.4.0-py3-none-any.whl","pyodide_http-0.2.1-py3-none-any.whl","pywidevine-1.8.0-py3-none-any.whl","requests-2.31.0-py3-none-any.whl","urllib3-2.2.1-py3-none-any.whl"].map(e=>"libs/wheels/"+e))
 
     //Configure Guesser
     pyodide.globals.set("pssh", document.getElementById('pssh').value);