From 97215d42654ca4fea8fe60a7fd4b6f79b498e8e5 Mon Sep 17 00:00:00 2001
From: magmaus3 <magmaus3@disroot.org>
Date: Mon, 24 Jul 2023 18:53:22 +0200
Subject: [PATCH] Reduce the amount of functions on the backend

Instead of using separate functions for each step (hex -> bytearray -> base64
and the opposite),
this commit merges the required functions into their uses.
---
 index.html | 54 +++++++++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/index.html b/index.html
index a45fe70..c58c95c 100644
--- a/index.html
+++ b/index.html
@@ -7,58 +7,42 @@
         <script>
             /*
              * TODO:
-             * - [ ] rewrite functions to not use copied functions 
+             * - [x] rewrite functions to not use copied functions 
              * - [x] add UI
              * - [x] add style
-             * - [ ] make everything not look like made at 0:41 on a phone
+             * - [x] make everything not look like made at 0:41 on a phone
              */
-            function hexToBytes(hexdata) {
-                // https://stackoverflow.com/a/39396866
-                var arr = hexdata.replace(/[^0-9a-fA-F]/g, '')
+            function infohashToBase64(infohash) {
+                // Converts an hex infohash into base64.
+
+                // Convert hex into an byte array
+                let byteArray = infohash.replace(/[^0-9a-fA-F]/g, '')
                     .match(/[0-9a-fA-F]{2}/g);
-                for(var i = 0; i<arr.length; i++) {
-                    arr[i] = parseInt(arr[i], 16);
+                for(var i = 0; i<byteArray.length; i++) {
+                    byteArray[i] = parseInt(byteArray[i], 16);
                 }
 
-                return arr;
-            }
-            
-            function bytesToBase64(byteArray) {
-                // https://stackoverflow.com/a/11562550
+                // Convert byteArray into base64
                 return btoa(
                     String.fromCharCode.apply(
                         null, new Uint8Array(byteArray)
                     )
                 );
             }
-            
-            function base64ToArray(base64) {
-                // https://stackoverflow.com/a/21797381
-                var binaryString = atob(base64);
-                var bytes = new Uint8Array(binaryString.length);
-                for (var i = 0; i < binaryString.length; i++) {
-                        bytes[i] = binaryString.charCodeAt(i);
-                    }
-                    return bytes;
-            }
+            function base64ToInfohash(b64) {
+                // Converts a base64 value into a infohash (in a hex form)
 
-            function bytesToHex(byteArray) {
-                // https://stackoverflow.com/a/34310051
+                // Convert base64 into an byteArray
+                let binaryString = atob(b64);
+                let byteArray = new Uint8Array(binaryString.length);
+                for (var i = 0; i < binaryString.length; i++) {
+                        byteArray[i] = binaryString.charCodeAt(i);
+                    }
+                // Convert byteArray into hex values 
                 return Array.from(byteArray, function(byte) {
                     return ('0' + (byte & 0xFF).toString(16)).slice(-2);
                 }).join('');
             }
-
-            function infohashToBase64(infohash) {
-                return bytesToBase64(
-                    hexToBytes(infohash)
-                );
-            }
-            function base64ToInfohash(b64) {
-                return bytesToHex(
-                    base64ToArray(b64)
-                );
-            }
             
             // Everything for the UI itself