Refactor: put external libraries in libs folder together

FoxRefire · Oct 12, 2024 · b5f0643 · b5f0643
1 parent d7a39b2
commit b5f0643
Show file tree

Hide file tree

Showing 22 changed files with 3 additions and 3 deletions.
diff --git a/jsonview.js → libs/jsonview.js b/jsonview.js → libs/jsonview.js
diff --git a/pyodide/package.json → libs/pyodide/package.json b/pyodide/package.json → libs/pyodide/package.json
diff --git a/pyodide/pyodide-lock.json → libs/pyodide/pyodide-lock.json b/pyodide/pyodide-lock.json → libs/pyodide/pyodide-lock.json
diff --git a/pyodide/pyodide.asm.js → libs/pyodide/pyodide.asm.js b/pyodide/pyodide.asm.js → libs/pyodide/pyodide.asm.js
diff --git a/pyodide/pyodide.asm.wasm → libs/pyodide/pyodide.asm.wasm b/pyodide/pyodide.asm.wasm → libs/pyodide/pyodide.asm.wasm
diff --git a/pyodide/pyodide.js → libs/pyodide/pyodide.js b/pyodide/pyodide.js → libs/pyodide/pyodide.js
diff --git a/pyodide/pyodide.mjs → libs/pyodide/pyodide.mjs b/pyodide/pyodide.mjs → libs/pyodide/pyodide.mjs
diff --git a/pyodide/python_stdlib.zip → libs/pyodide/python_stdlib.zip b/pyodide/python_stdlib.zip → libs/pyodide/python_stdlib.zip
diff --git a/wheels/certifi-2024.2.2-py3-none-any.whl → .../wheels/certifi-2024.2.2-py3-none-any.whl b/wheels/certifi-2024.2.2-py3-none-any.whl → .../wheels/certifi-2024.2.2-py3-none-any.whl
diff --git a/...charset_normalizer-3.3.2-py3-none-any.whl → ...charset_normalizer-3.3.2-py3-none-any.whl b/...charset_normalizer-3.3.2-py3-none-any.whl → ...charset_normalizer-3.3.2-py3-none-any.whl
diff --git a/wheels/construct-2.8.8-py2.py3-none-any.whl → ...eels/construct-2.8.8-py2.py3-none-any.whl b/wheels/construct-2.8.8-py2.py3-none-any.whl → ...eels/construct-2.8.8-py2.py3-none-any.whl
diff --git a/wheels/idna-3.6-py3-none-any.whl → libs/wheels/idna-3.6-py3-none-any.whl b/wheels/idna-3.6-py3-none-any.whl → libs/wheels/idna-3.6-py3-none-any.whl
diff --git a/wheels/packaging-23.2-py3-none-any.whl → libs/wheels/packaging-23.2-py3-none-any.whl b/wheels/packaging-23.2-py3-none-any.whl → libs/wheels/packaging-23.2-py3-none-any.whl
diff --git a/...-cp312-cp312-emscripten_3_1_52_wasm32.whl → ...-cp312-cp312-emscripten_3_1_52_wasm32.whl b/...-cp312-cp312-emscripten_3_1_52_wasm32.whl → ...-cp312-cp312-emscripten_3_1_52_wasm32.whl
diff --git a/....0-cp35-abi3-emscripten_3_1_52_wasm32.whl → ....0-cp35-abi3-emscripten_3_1_52_wasm32.whl b/....0-cp35-abi3-emscripten_3_1_52_wasm32.whl → ....0-cp35-abi3-emscripten_3_1_52_wasm32.whl
diff --git a/wheels/pymp4-1.4.0-py3-none-any.whl → libs/wheels/pymp4-1.4.0-py3-none-any.whl b/wheels/pymp4-1.4.0-py3-none-any.whl → libs/wheels/pymp4-1.4.0-py3-none-any.whl
diff --git a/wheels/pyodide_http-0.2.1-py3-none-any.whl → ...heels/pyodide_http-0.2.1-py3-none-any.whl b/wheels/pyodide_http-0.2.1-py3-none-any.whl → ...heels/pyodide_http-0.2.1-py3-none-any.whl
diff --git a/wheels/pywidevine-1.8.0-py3-none-any.whl → .../wheels/pywidevine-1.8.0-py3-none-any.whl b/wheels/pywidevine-1.8.0-py3-none-any.whl → .../wheels/pywidevine-1.8.0-py3-none-any.whl
diff --git a/wheels/requests-2.31.0-py3-none-any.whl → libs/wheels/requests-2.31.0-py3-none-any.whl b/wheels/requests-2.31.0-py3-none-any.whl → libs/wheels/requests-2.31.0-py3-none-any.whl
diff --git a/wheels/urllib3-2.2.1-py3-none-any.whl → libs/wheels/urllib3-2.2.1-py3-none-any.whl b/wheels/urllib3-2.2.1-py3-none-any.whl → libs/wheels/urllib3-2.2.1-py3-none-any.whl
diff --git 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 @@ <h3>Clearkey detected</h3>
   </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
@@ -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);