replaced binserve with http-server, skip preprocessing if files didn't change

Author: slatinsky

.gitignore

@@ -13,6 +13,7 @@ node_modules
 /static/input
 /static/data
 /releases/bin/preprocess.exe
+/releases/bin/http-server.exe
 /releases/static/
 /releases/*.zip
 /_temp_input/

BUILD_RELEASE.bat

@@ -11,8 +11,10 @@ del releases\bin\preprocess.exe
 cd preprocess
 pyinstaller preprocess.py -F
 cd ..
+call pkg server/node_modules/http-server/bin/http-server --target node16-win-x64
 @REM Move build to releases
 move "preprocess\dist\preprocess.exe" "releases\bin\preprocess.exe"
+move "http-server.exe" "releases\bin\http-server.exe"
 
 @REM Build sveltekit frontend
 call npm run build

README.md

@@ -92,15 +92,22 @@ npm run dev -- --open
 ```
 py -m pip install pyinstaller
 ```
+pkg (installed globally)
+```
+npm install -g pkg
+```
 
 ## Steps
 1. Clone this repository
 ```bash
-git clone URL
+git clone https://github.com/slatinsky/DiscordChatExporter-frontend
 ```
 2. Install dependencies
 ```bash
 npm install
+cd server
+npm install
+cd ..
 ```
 3. Make sure you have Python3.9+ Node.js 16 and pyinstaller installed:
 ```
@@ -144,8 +151,8 @@ v16.14.2
 >pyinstaller --version
 5.5
 
-Binserve version:
-binserve-v0.2.0-i686-pc-windows-msvc
+>pkg --version
+5.8.0
 
 DiscordChatExporter version:
 v2.36.1
@@ -183,15 +190,12 @@ But should work on any Windows 10 / Windows 11 x64 computer.
 - [Tyrrrz/DiscordChatExporter](https://github.com/Tyrrrz/DiscordChatExporter) - for a great tool. Many CSS definitions from this tool are used in our viewer.
 - Discord - for a great chat app
 - pyinstaller - for python to binary converter
-- [mufeedvh/binserve](https://github.com/mufeedvh/binserve) - for local webserver binary
 - [brussell98/discord-markdown](https://github.com/brussell98/discord-markdown) - for discord markdown rendering
 
 
 ## License
 GNU GENERAL PUBLIC LICENSE
 
-included binserve binary uses MIT license
-
 ## Contributing
 Feel free to open issues and pull requests.
 

preprocess/preprocess.py

@@ -396,10 +396,49 @@ def _find_all_mediafiles_paths(self, directory):
     #     self.guilds = sorted(self.guilds, key=lambda d: d['name'])
     #     return
 
+    def should_process(self, json_files, media_filepaths):
+        file_count = len(json_files) + len(media_filepaths)
+        print("Found " + str(file_count) + " files")
+
+        # make directory if it doesn't exist
+        if not os.path.exists('../static/data'):
+            os.makedirs('../static/data')
+
+        # if data/hash.txt does exists read the hash
+        if os.path.exists('../static/data/hash.txt'):
+            with open('../static/data/hash.txt', 'r') as f:
+                hash_from_file = f.read()
+                print("Hash: " + hash_from_file) 
+        else:
+            print("Hash file does not exist")
+            hash_from_file = None
+
+
+        # create hash of all files
+        # if hash is the same, then we can skip processing
+        # because reprocessing takes a lot of time
+        new_hash = sha256((str(json_files) + str(media_filepaths)).encode('utf-8')).hexdigest()
+
+        if hash_from_file == new_hash:
+            print("Hash is the same, skipping processing")
+            return False
+        else:
+            # write new hash to file
+            with open('../static/data/hash.txt', 'w') as f:
+                f.write(new_hash)
+
+            print("Hash is different, processing")
+            return True
+
+
     def process(self):
         json_files = self._find_json_files(self.input_directory)
         media_filepaths = self._find_all_mediafiles_paths(self.input_directory)
 
+        if not self.should_process(json_files, media_filepaths):
+            print("Skipping processing")
+            return
+
         guilds = {}
 
         # sort filenames by guild to attempt to split ram usage

releases/START_VIEWER.bat

@@ -1,5 +1,5 @@
 pushd "%~dp0"
 cd bin
 preprocess.exe
-if exist "C:\Program Files\Google\Chrome\Application\chrome.exe" ("C:\Program Files\Google\Chrome\Application\chrome.exe" --app="http://127.0.0.1:1337/index.html") else (rundll32 url.dll,FileProtocolHandler http://127.0.0.1:1337/index.html)
-binserve.exe
+if exist "C:\Program Files\Google\Chrome\Application\chrome.exe" ("C:\Program Files\Google\Chrome\Application\chrome.exe" --app="http://127.0.0.1:21011/index.html") else (rundll32 url.dll,FileProtocolHandler http://127.0.0.1:21011/index.html)
+http-server.exe "../static" --port 21011 -c-1 --silent -P http://127.0.0.1:21011?