rewrite winIconLauncher in c++

pyrretsoftware · Aug 31, 2024 · c01a196 · c01a196
1 parent 8b82592
commit c01a196
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 74 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "filesystem": "cpp"
+    }
+}
diff --git a/bin/iconhost.deps.json b/bin/iconhost.deps.json
diff --git a/bin/iconhost.exe b/bin/iconhost.exe
diff --git a/bin/iconhost.pdb b/bin/iconhost.pdb
diff --git a/bin/iconhost.runtimeconfig.json b/bin/iconhost.runtimeconfig.json
diff --git a/config.json b/config.json
@@ -10,5 +10,6 @@
     "idlingImageStyle": "nostalgia-1",
     "alwaysFullReload": false,
     "searchEngine": "youtube",
-    "discordRpcEnabled": true
+    "discordRpcEnabled": true,
+    "useWic" : true
 }
diff --git a/helpers/core/commandProcessor.js b/helpers/core/commandProcessor.js
@@ -120,23 +120,11 @@ export async function processCommand(command) {
             killAudioProcesses()
             process.exit()
             break;
-        case 'about':
-            const useWinIconLauncher = (() => { 
-                if (process.platform === 'win32') { 
-                    try {
-                        const dotNetInfo = execSync('dotnet --info')
-                        if (dotNetInfo.toString().includes('8.')) {
-                            return true
-                        }
-                    } catch (e) {}
-                }
-                return false
-            })()
-
-            if (useWinIconLauncher) {
-                spawn(`${getCrossPlatformString("new-terminal-window")} iconhost.exe about`, [], {
+        case 'about':        
+            if (config['useWic']) {
+                spawn(`${getCrossPlatformString("new-terminal-window")} winIconLauncher.exe about`, [], {
                     shell: true,
-                    cwd: path.join(path.dirname(fileURLToPath(import.meta.url)), '../', '../', 'bin')
+                    cwd: path.join(path.dirname(fileURLToPath(import.meta.url)), '../', '../', 'wic')
                 })
             } else {
                 spawn(`${getCrossPlatformString("new-terminal-window")} node ${directory} about`, [], {shell: true})

diff --git a/bin/iconhost.dll → images/icon.ico b/bin/iconhost.dll → images/icon.ico
diff --git a/launch/launcher.js b/launch/launcher.js
@@ -4,6 +4,7 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import { Green, Magenta, PastelGreen, PastelRed, Red, Reset, Yellow } from '../helpers/misc/colorCodes.js';
 import { checkForUpdates } from '../helpers/startup/updateChecker.js'
+import { config } from '../snippets/config.js';
 
 const directory = path.join(path.dirname(fileURLToPath(import.meta.url)), '../', 'termusic.js')
 
@@ -36,31 +37,12 @@ export async function startLauncher() {
     } else {
         console.log(`[${PastelGreen}DONE${Reset}]`)
     }
-
-    const useWinIconLauncher = (() => { 
-        if (process.platform === 'win32') { 
-            process.stdout.write('Checking whether winIconLauncher can be used ')
-            try {
-                const dotNetInfo = execSync('dotnet --info')
-
-                if (dotNetInfo.toString().includes('8.')) {
-                    console.log(`[${PastelGreen}DONE${Reset}]`)
-                    return true
-                } else {
-                    console.log(`[${PastelRed}.NET 8.0 NOT FOUND${Reset}]`)
-                }
-            } catch (e) {
-                console.log(`[${PastelRed}NO .NET RUNTIMES FOUND${Reset}]`)
-            }
-        }
-        return false
-    })()
     process.stdout.write('Launching termusic in a seperate window ')
 
-    if (useWinIconLauncher) {
-        spawn(`${getCrossPlatformString("new-terminal-window")} iconhost.exe launch`, [], {
+    if (config['useWic']) {
+        spawn(`${getCrossPlatformString("new-terminal-window")} winIconLauncher.exe launch`, [], {
             shell: true,
-            cwd: path.join(path.dirname(fileURLToPath(import.meta.url)), '../', 'bin')
+            cwd: path.join(path.dirname(fileURLToPath(import.meta.url)), '../', 'wic')
         })
     } else {
         spawn(`${getCrossPlatformString("new-terminal-window")} node ${directory} launch`, [], {shell: true})

diff --git a/wic/readme b/wic/readme
@@ -0,0 +1 @@
+simply compile the file winIconLauncher.cpp in your favourite compiler. The program icon is added afterwards using resource hacker and the icon file located at ./images/icon.ico
diff --git a/wic/winIconLauncher.cpp b/wic/winIconLauncher.cpp
@@ -0,0 +1,12 @@
+#include <iostream>
+#include <string>
+#include <cstdlib>
+#include <filesystem>
+
+int main(int argc, char* argv[]) {
+    std::string path = std::filesystem::current_path().parent_path().string();
+    std::string command = "cmd.exe /c node " + path + "\\termusic.js " + (argc > 1 ? argv[1] : "");
+    system(command.c_str());
+    return 0;
+}
+
diff --git a/wic/winIconLauncher.exe b/wic/winIconLauncher.exe
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		simply compile the file winIconLauncher.cpp in your favourite compiler. The program icon is added afterwards using resource hacker and the icon file located at ./images/icon.ico