fix unix detection and small tweaks

Author: echolotl

src-tauri/src/paths.rs

@@ -1,14 +1,16 @@
+use serde::Serialize;
 use std::{
-    env::consts::EXE_EXTENSION,
     fs,
     path::{Path, PathBuf},
 };
 
-use serde::Serialize;
-
 /// Windows EXE suffix for unix systems where EXE_SUFFIX is empty, used for wine support
 pub const WINDOWS_EXE_EXTENSION: &str = "exe";
 
+// This is used to exclude certain file types from being detected as executables. This will match any part of the file extension!
+// For example, "file.so.lol" will be excluded because it contains "so"
+pub const EXCLUDED_EXE_FILE_EXTENSIONS: [&str; 2] = ["ndll", "so"];
+
 /// Allows engine detectors to find out what type of executable they found, used for wine support
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
 pub enum ExecutableType {
@@ -32,6 +34,63 @@ pub fn get_paths_in_folder(folder_path: &Path) -> Vec<PathBuf> {
     vec![]
 }
 
+fn get_executable_type(path: &Path) -> Option<ExecutableType> {
+    if path.is_dir() {
+        return None;
+    }
+
+    #[cfg(target_family = "unix")]
+    {
+        // First check if it's an ELF binary (with exclusions)
+        let valid_elf = loop {
+            if let Some(ext) = path.extension() {
+                if let Some(ext_str) = ext.to_str() {
+                    if EXCLUDED_EXE_FILE_EXTENSIONS.contains(&ext_str) {
+                        log::info!(
+                            "Excluded file extension found: {} ({}), skipping ELF check",
+                            ext_str,
+                            path.display()
+                        );
+                        break false;
+                    }
+                }
+            }
+            break true;
+        };
+
+        if valid_elf {
+            if let Ok(mut file) = fs::File::open(path) {
+                use std::io::Read;
+                let mut magic_buf = [0u8; 4];
+                if file.read_exact(&mut magic_buf).is_ok() && &magic_buf == b"\x7FELF" {
+                    log::info!("ELF executable found: {}", path.display());
+                    return Some(ExecutableType::Platform);
+                }
+            }
+        }
+
+        // if not an ELF, check if it has a windows exe suffix for wine support
+        if let Some(ext) = path.extension() {
+            if ext == WINDOWS_EXE_EXTENSION {
+                log::info!("Windows executable found: {}", path.display());
+                return Some(ExecutableType::WindowsOnUnix);
+            }
+        }
+    }
+
+    #[cfg(target_family = "windows")]
+    {
+        if let Some(ext) = path.extension() {
+            if ext == "exe" {
+                log::info!("Windows executable found: {}", path.display());
+                return Some(ExecutableType::Platform);
+            }
+        }
+    }
+
+    None
+}
+
 pub fn get_folders_in_folder(folder_path: &Path) -> Vec<String> {
     let folders = get_paths_in_folder(folder_path);
     let mut found_folders = vec![];
@@ -53,20 +112,8 @@ pub fn check_for_specific_executable(folder_path: &Path, name: String) -> Option
     for file in paths {
         if let Some(file_stem) = file.file_stem() {
             if !file.is_dir() && *file_stem == *name {
-                if let Some(ext) = file.extension() {
-                    let is_platform_executable = *ext == *EXE_EXTENSION;
-
-                    if is_platform_executable {
-                        return Some(ExecutableType::Platform);
-                    } else {
-                        // A check for .exe on unix systems, since some users use Wine to run the engines
-                        #[cfg(target_family = "unix")]
-                        {
-                            if *ext == *WINDOWS_EXE_EXTENSION {
-                                return Some(ExecutableType::WindowsOnUnix);
-                            }
-                        }
-                    }
+                if let Some(executable_type) = get_executable_type(file.as_path()) {
+                    return Some(executable_type);
                 }
             }
         }
@@ -81,22 +128,8 @@ pub fn check_for_any_executable(folder_path: &Path) -> Option<(ExecutableType, P
     let mut found_executables: Vec<(ExecutableType, PathBuf)> = vec![];
 
     for file in paths {
-        if let Some(ext) = file.extension() {
-            if !file.is_dir() {
-                let is_platform_executable = *ext == *EXE_EXTENSION;
-
-                if is_platform_executable {
-                    found_executables.push((ExecutableType::Platform, file));
-                } else {
-                    // A check for .exe on unix systems, since some users use Wine to run the engines
-                    #[cfg(target_family = "unix")]
-                    {
-                        if *ext == *WINDOWS_EXE_EXTENSION {
-                            found_executables.push((ExecutableType::WindowsOnUnix, file));
-                        }
-                    }
-                }
-            }
+        if let Some(executable_type) = get_executable_type(file.as_path()) {
+            found_executables.push((executable_type, file));
         }
     }
 

src/components/library/InstanceSettingsPopover.vue

@@ -28,7 +28,10 @@ defineProps<{
 
 <template>
   <PopoverRoot v-model:open="open" :modal="true">
-    <PopoverTrigger class="simple-button" :disabled="disabled">
+    <PopoverTrigger
+      class="btn-simple w-8 rounded-full p-1"
+      :disabled="disabled"
+    >
       <img src="@assets/images/icon/wrench.png?url" />
     </PopoverTrigger>
     <PopoverPortal>
@@ -49,7 +52,12 @@ defineProps<{
           </fieldset>
           <fieldset>
             <label for="version"> Version </label>
-            <input id="version" type="text" v-model="editDraft.version" />
+            <input
+              id="version"
+              type="text"
+              v-model="editDraft.version"
+              placeholder="0.0.0"
+            />
           </fieldset>
           <fieldset>
             <label for="color"> Color </label>
@@ -66,6 +74,7 @@ defineProps<{
           <CollapsibleRoot class="col-span-2" v-model:open="advancedOpen">
             <CollapsibleTrigger
               class="w-full flex justify-between items-center hover:bg-modfriend-700 text-modfriend-500"
+              as="legend"
             >
               Advanced Settings
               <img
@@ -97,9 +106,9 @@ defineProps<{
         </div>
         <PopoverArrow class="fill-modfriend-700" />
         <PopoverClose
-          class="simple-button text-modfriend-50 w-16 absolute right-1 top-1"
+          class="btn-simple text-modfriend-50 w-6 absolute right-2 top-2.5 rounded-full"
         >
-          <img src="@assets/images/icon/close.png?url" class="size-4" />
+          <img src="@assets/images/icon/close.png?url" class="size-6" />
         </PopoverClose>
       </PopoverContent>
     </PopoverPortal>
@@ -109,14 +118,6 @@ defineProps<{
 <style scoped lang="css">
 @reference "maincss";
 
-.simple-button {
-  @apply size-8 shrink-0 grid place-items-center rounded-full hover:bg-modfriend-500/30 active:bg-modfriend-500/50 transition-colors;
-
-  > img {
-    @apply size-6;
-  }
-}
-
 :deep(.instance-settings) {
   @apply bg-modfriend-800 p-2 rounded-xl border border-modfriend-700 flex flex-col gap-4 mb-2 shadow-lg shadow-black/25;
 
@@ -140,6 +141,9 @@ defineProps<{
       textarea {
         @apply resize-none;
       }
+      input[type='color'] {
+        @apply h-full w-full rounded-md;
+      }
     }
   }
 }

src/main.css

@@ -136,6 +136,9 @@
       background-blend-mode: plus-lighter;
     }
   }
+  .btn-simple {
+    @apply shrink-0 flex items-center justify-center hover:bg-modfriend-500/30 active:bg-modfriend-500/50 transition-colors aspect-square;
+  }
   #widget {
     /* TODO: stylize this properly */
     border: 1px solid black;

src/views/Library.vue

@@ -356,6 +356,14 @@ onMounted(async () => {
 
           if (addedAtLeastOne) {
             await refreshEngineContexts();
+            // Select one of the engines
+            var newItem: ListDisplayInfo | undefined = listItems.value.find(
+              (item) =>
+                item.instance?.folder_path === hoverState.value.paths?.[0],
+            );
+            if (newItem) {
+              selectItem(newItem);
+            }
           }
         }
       }
@@ -417,6 +425,7 @@ onBeforeUnmount(() => {
           <ScrollAreaViewport class="w-full h-full">
             <div
               class="engine-item"
+              v-if="listItems.length !== 0"
               v-for="item in listItems"
               :key="item.canonInfo.folder_path"
               :class="{ current: item === curItem }"
@@ -454,6 +463,16 @@ onBeforeUnmount(() => {
                 </div>
               </div>
             </div>
+            <div v-else class="p-4 text-modfriend-500 text-md">
+              <b>No instances added yet!</b><br />
+              Add an engine by clicking the
+              <img
+                src="@assets/images/icon/add.png?url"
+                class="inline size-4"
+              />
+              button or by dragging and dropping an engine folder into the
+              sidebar.
+            </div>
           </ScrollAreaViewport>
         </div>
         <ScrollAreaScrollbar orientation="vertical" class="scrollbar">
@@ -480,7 +499,7 @@ onBeforeUnmount(() => {
             }}
           </h1>
           <div class="infobar">
-            <div>
+            <div class="infobar-content">
               <button
                 class="btn-shiny action-button"
                 @click="handleLaunchClick"
@@ -519,9 +538,12 @@ onBeforeUnmount(() => {
                 </span>
               </div>
             </div>
-            <div>
-              <button class="simple-button" @click="handleDelete">
-                <img src="@assets/images/icon/delete.png?url" class="size-6" />
+            <div class="flex items-center gap-2">
+              <button
+                class="btn-simple w-8 rounded-full p-1"
+                @click="handleDelete"
+              >
+                <img src="@assets/images/icon/delete.png?url" />
               </button>
               <InstanceSettingsPopover
                 v-model:open="instanceSettingsOpen"
@@ -551,7 +573,7 @@ onBeforeUnmount(() => {
 @reference "maincss";
 
 .content {
-  @apply flex flex-row min-h-0;
+  @apply flex flex-row min-h-0 min-w-0 w-full;
 }
 
 .list-panel {
@@ -589,7 +611,7 @@ onBeforeUnmount(() => {
   }
 }
 .main-content {
-  @apply w-full;
+  @apply flex-1 min-w-0 min-h-0;
 
   /* This is terrible, but it's so that we can have full width components if we need to */
   > .scroll-area-content {
@@ -684,7 +706,7 @@ onBeforeUnmount(() => {
 }
 .infobar {
   @apply flex items-center gap-4 mb-4 justify-between;
-  > div {
+  > .infobar-content {
     @apply flex items-center gap-4;
   }