feat: Install Location & adapt Reset button for this possibility & feat: CPU threads & cores are consistent now, updated to strictly physical cores everywhere (#219)

* feat: Install Location & adapt Reset button for this possibility
fix/chore: CPU threads & cores are consistent now, updated to strictly physical cores everywhere

* chore: Bump version to 0.8.6-alpha for new alpha

Author: TibixDev

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "winboat",
-    "version": "0.8.5",
+    "version": "0.8.6-alpha",
     "description": "Windows for Penguins",
     "type": "module",
     "main": "main/main.js",
@@ -41,6 +41,7 @@
         "@vueuse/core": "^13.1.0",
         "@vueuse/motion": "^2.2.6",
         "apexcharts": "^4.5.0",
+        "check-disk-space": "^3.4.0",
         "consola": "^3.4.2",
         "electron-store": "^11.0.0",
         "form-data": "^4.0.4",

package.json

@@ -111,17 +111,23 @@ export class InstallManager {
     createComposeFile() {
         this.changeState(InstallStates.CREATING_COMPOSE_FILE);
 
-        // Ensure the directory exists
+        // Ensure the .winboat directory exists
         if (!fs.existsSync(WINBOAT_DIR)) {
             fs.mkdirSync(WINBOAT_DIR);
             logger.info(`Created WinBoat directory: ${WINBOAT_DIR}`);
         }
 
+        // Ensure the installation directory exists
+        if (!fs.existsSync(this.conf.installFolder)) {
+            fs.mkdirSync(this.conf.installFolder, { recursive: true });
+            logger.info(`Created installation directory: ${this.conf.installFolder}`);
+        }
+
         // Configure the compose file
         const composeContent = { ...DefaultCompose }
 
         composeContent.services.windows.environment.RAM_SIZE = `${this.conf.ramGB}G`;
-        composeContent.services.windows.environment.CPU_CORES = `${this.conf.cpuThreads}`;
+        composeContent.services.windows.environment.CPU_CORES = `${this.conf.cpuCores}`;
         composeContent.services.windows.environment.DISK_SIZE = `${this.conf.diskSpaceGB}G`;
         composeContent.services.windows.environment.VERSION = this.conf.windowsVersion;
         composeContent.services.windows.environment.LANGUAGE = this.conf.windowsLanguage;
@@ -131,6 +137,15 @@ export class InstallManager {
         if (this.conf.customIsoPath) {
             composeContent.services.windows.volumes.push(`${this.conf.customIsoPath}:/boot.iso`);
         }
+
+        const storageFolderIdx = composeContent.services.windows.volumes.findIndex(vol => vol.includes('/storage'));
+        if (storageFolderIdx !== -1) {
+            composeContent.services.windows.volumes[storageFolderIdx] = `${this.conf.installFolder}:/storage`;
+        } else {
+            logger.warn("No /storage volume found in compose template, adding one...");
+            composeContent.services.windows.volumes.push(`${this.conf.installFolder}:/storage`);
+        }
+
 
         // Write the compose file
         const composeYAML = YAML.stringify(composeContent).replaceAll("null", "");

src/renderer/lib/install.ts

@@ -15,14 +15,12 @@ export function satisfiesPrequisites(specs: Specs) {
         specs.iptableNatLoaded &&
         specs.kvmEnabled &&
         specs.ramGB >= 4 &&
-        specs.cpuThreads >= 2 &&
-        specs.diskSpaceGB >= 32
+        specs.cpuCores >= 2
 }
 
 export const defaultSpecs: Specs = { 
-    cpuThreads: 0,
+    cpuCores: 0,
     ramGB: 0,
-    diskSpaceGB: 0,
     kvmEnabled: false,
     dockerInstalled: false,
     dockerComposeInstalled: false,
@@ -36,7 +34,13 @@ export const defaultSpecs: Specs = {
 export async function getSpecs() {
     const specs: Specs = { ...defaultSpecs };
 
-    specs.cpuThreads = os.cpus().length;
+    // Physical CPU cores check
+    try {
+        const res = (await execAsync('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l')).stdout;
+        specs.cpuCores = parseInt(res.trim(), 10);
+    } catch(e) {
+        console.error('Error getting CPU cores:', e);
+    }
 
     // TODO: These commands might silently fail
     // But if they do, it means something wasn't right to begin with
@@ -47,18 +51,6 @@ export async function getSpecs() {
         console.error('Error reading /proc/meminfo:', e);
     }
 
-    // Docker check
-    try {
-        // We use /var here because /var/lib/docker is _the_ location for Docker data.
-        // Also it covers cases of immutable distros using Podman (hello Bazzite!), since
-        // /home is a symlink to /var/home there.
-        // TODO:hdkv where does Podman stores the images and the data on non-immutables (aka regular Fedora)?
-        const diskStats = fs.statfsSync('/var');
-        specs.diskSpaceGB = Math.round(diskStats.bavail * diskStats.bsize / 1024 / 1024 / 1024 * 100) / 100;
-    } catch (e) {
-        console.error('Error getting disk space for /var:', e);
-    }
-
     // KVM check
     try {
         const cpuInfo = fs.readFileSync('/proc/cpuinfo', 'utf8');

src/renderer/lib/specs.ts

@@ -557,9 +557,22 @@ export class Winboat {
         await execAsync("docker rm WinBoat")
         console.info("Removed container")
 
-        // 3. Remove the container volume
-        await execAsync("docker volume rm winboat_data");
-        console.info("Removed volume");
+        // 3. Remove the container volume or folder
+        const compose = this.parseCompose();
+        const storage = compose.services.windows.volumes.find(vol => vol.includes('/storage'));
+        if (storage?.startsWith("data:")) {
+            // In this case we have a volume (legacy)
+            await execAsync("docker volume rm winboat_data");
+            console.info("Removed volume");
+        } else {
+            const storageFolder = storage?.split(":").at(0) ?? null;
+            if (storageFolder && fs.existsSync(storageFolder)) {
+                fs.rmSync(storageFolder, { recursive: true, force: true });
+                console.info(`Removed storage folder at ${storageFolder}`);
+            } else {
+                console.warn("Storage folder does not exist, skipping removal");
+            }
+        }
 
         // 4. Remove WinBoat directory
         fs.rmSync(WINBOAT_DIR,  { recursive: true, force: true });

src/renderer/lib/winboat.ts

@@ -1,6 +1,6 @@
 <template>
     <div class="flex flex-col items-center justify-center h-[calc(100vh-9rem)]">
-        <img class="w-48" src="/img/winboat_logo.png">
+        <img class="w-48" src="/img/winboat_logo.svg">
         <h2 class="mb-0">WinBoat</h2>
         <p class="text-sm text-gray-500">Windows for 🐧 penguins</p>
         <p class="text-gray-400 !mt-4">WinBoat Beta v{{ appVer }} {{ isDev ? 'Dev' : 'Prod' }}</p>

src/renderer/public/img/winboat_logo.svg

@@ -479,7 +479,7 @@ async function assignValues() {
 
     const specs = await getSpecs();
     maxRamGB.value = specs.ramGB;
-    maxNumCores.value = specs.cpuThreads;
+    maxNumCores.value = specs.cpuCores;
 
     refreshAvailableDevices();
 }