Beta bugs (#562)

* fixed bugs * added logging for atlauncher * draft: improving imports time * more improvements * more * prettier, etc * small changes * emma suggested change * rev * removed atlauncher debug
2023-08-14 13:23:42 -07:00
parent a1a5b8ed9c
commit d6ee1ff25a
33 changed files with 357 additions and 321 deletions
--- a/theseus_gui/dist/splashscreen.html
+++ b/theseus_gui/dist/splashscreen.html
@@ -1,151 +0,0 @@
-<body>
-<div class="splashscreen">
-    <div class="splashscreen__icon">
-        <svg
-                class="rotate outer"
-                width="100%"
-                height="100%"
-                viewBox="0 0 590 591"
-                xmlns="http://www.w3.org/2000/svg"
-                xml:space="preserve"
-                style="fill-rule: evenodd; clip-rule: evenodd; stroke-linejoin: round; stroke-miterlimit: 2"
-        >
-      <g transform="matrix(1,0,0,1,652.392,-0.400578)">
-        <g transform="matrix(4.16667,0,0,4.16667,-735.553,0)">
-          <g transform="matrix(0.24,0,0,0.24,0,0)">
-            <path
-                    d="M134.44,316.535C145.027,441.531 249.98,539.829 377.711,539.829C474.219,539.829 557.724,483.712 597.342,402.371L645.949,419.197C599.165,520.543 496.595,590.954 377.711,590.954C221.751,590.954 93.869,469.779 83.161,316.535L134.44,316.535ZM83.946,265.645C99.012,116.762 224.88,0.401 377.711,0.401C540.678,0.401 672.987,132.71 672.987,295.677C672.987,321.817 669.583,347.168 663.194,371.313L614.709,354.529C619.381,335.689 621.862,315.971 621.862,295.677C621.862,160.926 512.461,51.526 377.711,51.526C253.133,51.526 150.223,145.03 135.392,265.645L83.946,265.645Z"
-                    style="fill: var(--color-brand)"
-            />
-          </g>
-        </g>
-      </g></svg
-        ><svg
-            class="rotate inner"
-            width="100%"
-            height="100%"
-            viewBox="0 0 590 591"
-            xmlns="http://www.w3.org/2000/svg"
-            xml:space="preserve"
-            style="fill-rule: evenodd; clip-rule: evenodd; stroke-linejoin: round; stroke-miterlimit: 2"
-    >
-      <g transform="matrix(1,0,0,1,652.392,-0.400578)">
-        <g transform="matrix(4.16667,0,0,4.16667,-735.553,0)">
-          <g transform="matrix(0.24,0,0,0.24,0,0)">
-            <path
-                    d="M376.933,153.568C298.44,153.644 234.735,217.396 234.735,295.909C234.735,374.47 298.516,438.251 377.077,438.251C381.06,438.251 385.005,438.087 388.914,437.764L403.128,487.517C394.611,488.667 385.912,489.261 377.077,489.261C270.363,489.261 183.725,402.623 183.725,295.909C183.725,189.195 270.363,102.557 377.077,102.557C379.723,102.557 382.357,102.611 384.983,102.717L376.933,153.568ZM435.127,111.438C513.515,136.114 570.428,209.418 570.428,295.909C570.428,375.976 521.655,444.742 452.22,474.093L438.063,424.541C486.142,401.687 519.418,352.653 519.418,295.909C519.418,234.923 480.981,182.843 427.029,162.593L435.127,111.438Z"
-                    style="fill: var(--color-brand)"
-            />
-          </g>
-        </g>
-      </g>
-    </svg>
-        <svg
-                width="100%"
-                height="100%"
-                viewBox="0 0 590 591"
-                version="1.1"
-                xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xml:space="preserve"
-                xmlns:serif="http://www.serif.com/"
-                style="fill-rule: evenodd; clip-rule: evenodd; stroke-linejoin: round; stroke-miterlimit: 2"
-        >
-      <g transform="matrix(1,0,0,1,652.392,-0.400578)">
-        <g transform="matrix(4.16667,0,0,4.16667,-735.553,0)">
-          <g transform="matrix(0.24,0,0,0.24,0,0)">
-            <path
-                    d="M300.366,311.86L283.216,266.381L336.966,211.169L404.9,196.531L424.57,220.74L393.254,252.46L365.941,261.052L346.425,281.11L355.987,307.719L375.387,328.306L402.745,321.031L422.216,299.648L464.729,286.185L477.395,314.677L433.529,368.46L360.02,391.735L327.058,355.031L138.217,468.344C129.245,456.811 118.829,440.485 112.15,424.792L300.366,311.86Z"
-                    style="fill: var(--color-brand)"
-            />
-          </g>
-        </g>
-          <g transform="matrix(4.16667,0,0,4.16667,-735.553,0)">
-          <g transform="matrix(0.24,0,0,0.24,0,0)">
-            <path
-                    d="M655.189,194.555L505.695,234.873C513.927,256.795 516.638,269.674 518.915,283.863L668.152,243.609C665.764,227.675 661.5,211.444 655.189,194.555Z"
-                    style="fill: var(--color-brand)"
-            />
-          </g>
-        </g>
-      </g>
-    </svg>
-    </div>
-    <div class="splashscreen__text">Loading...</div>
-</div>
-</body>
-
-<style>
-    body {
-        font-family: Inter, -apple-system, BlinkMacSystemFont, Segoe UI, Oxygen, Ubuntu, Roboto, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
-        --color-brand: #1bd96a;
-        background-color: #16181c;
-    }
-
-    .splashscreen {
-        position: fixed;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        gap: 1rem;
-    }
-
-    .splashscreen__text {
-        color: #fff;
-        font-size: 1.5rem;
-        font-weight: 700;
-        margin-top: 1rem;
-    }
-
-    .splashscreen__text::after {
-        content: '';
-        display: block;
-        width: 0;
-        height: 2px;
-        background-color: #fff;
-        animation: loading 2s ease-in-out infinite;
-    }
-
-    @keyframes loading {
-        from {
-            width: 0;
-        }
-        to {
-            width: 100%;
-        }
-    }
-
-    .splashscreen__icon {
-        height: 10rem;
-        width: 10rem;
-    }
-
-    .splashscreen__icon svg {
-        width: 10rem;
-        height: 10rem;
-        position: absolute;
-    }
-
-    .rotate {
-        animation: rotate 4s infinite linear;
-    }
-
-    .inner {
-        animation: rotate 6s infinite linear reverse;
-    }
-
-
-    @keyframes rotate {
-        from {
-            transform: rotate(0deg);
-        }
-        to {
-            transform: rotate(360deg);
-        }
-    }
-</style>
--- a/theseus_gui/src-tauri/src/api/profile_create.rs
+++ b/theseus_gui/src-tauri/src/api/profile_create.rs
@@ -17,6 +17,7 @@ pub async fn profile_create(
    modloader: ModLoader, // the modloader to use
    loader_version: Option<String>, // the modloader version to use, set to "latest", "stable", or the ID of your chosen loader
    icon: Option<PathBuf>,          // the icon for the profile
+    no_watch: Option<bool>,
 ) -> Result<ProfilePathId> {
    let res = profile::create::profile_create(
        name,
@@ -27,6 +28,7 @@ pub async fn profile_create(
        None,
        None,
        None,
+        no_watch,
    )
    .await?;
    Ok(res)
--- a/theseus_gui/src/App.vue
+++ b/theseus_gui/src/App.vue
@@ -177,6 +177,20 @@ document.querySelector('body').addEventListener('click', function (e) {
  }
 })

+document.querySelector('body').addEventListener('auxclick', function (e) {
+  // disables middle click -> new tab
+  if (e.button === 1) {
+    e.preventDefault()
+    // instead do a left click
+    const event = new MouseEvent('click', {
+      view: window,
+      bubbles: true,
+      cancelable: true,
+    })
+    e.target.dispatchEvent(event)
+  }
+})
+
 const accounts = ref(null)

 command_listener((e) => {
--- a/theseus_gui/src/assets/stylesheets/global.scss
+++ b/theseus_gui/src/assets/stylesheets/global.scss
@@ -128,3 +128,10 @@ input {
  background-color: var(--color-raised-bg);
  box-shadow: none !important;
 }
+
+img {
+  user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+}
--- a/theseus_gui/src/components/GridDisplay.vue
+++ b/theseus_gui/src/components/GridDisplay.vue
@@ -200,6 +200,25 @@ const filteredResults = computed(() => {
    return instanceMap.set('None', instances)
  }

+  // For 'name', we intuitively expect the sorting to apply to the name of the group first, not just the name of the instance
+  // ie: Category A should come before B, even if the first instance in B comes before the first instance in A
+  if (sortBy.value === 'Name') {
+    const sortedEntries = [...instanceMap.entries()].sort((a, b) => {
+      // None should always be first
+      if (a[0] === 'None' && b[0] !== 'None') {
+        return -1
+      }
+      if (a[0] !== 'None' && b[0] === 'None') {
+        return 1
+      }
+      return a[0].localeCompare(b[0])
+    })
+    instanceMap.clear()
+    sortedEntries.forEach((entry) => {
+      instanceMap.set(entry[0], entry[1])
+    })
+  }
+
  return instanceMap
 })
 </script>
@@ -265,7 +284,7 @@ const filteredResults = computed(() => {
      <Instance
        v-for="(instance, index) in instanceSection.value"
        ref="instanceComponents"
-        :key="instance.id"
+        :key="instance.path"
        :instance="instance"
        @contextmenu.prevent.stop="(event) => handleRightClick(event, instanceComponents[index])"
      />
--- a/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
+++ b/theseus_gui/src/components/ui/IncompatibilityWarningModal.vue
@@ -165,5 +165,9 @@ td:first-child {
  flex-direction: column;
  gap: 1rem;
  padding: 1rem;
+
+  :deep(.animated-dropdown .options) {
+    max-height: 13.375rem;
+  }
 }
 </style>
--- a/theseus_gui/src/components/ui/ModInstallModal.vue
+++ b/theseus_gui/src/components/ui/ModInstallModal.vue
@@ -183,7 +183,7 @@ const createInstance = async () => {
  await router.push(`/instance/${encodeURIComponent(id)}/`)

  const instance = await get(id, true)
-  await installVersionDependencies(instance, versions.value)
+  await installVersionDependencies(instance, versions.value[0])

  mixpanel_track('InstanceCreate', {
    profile_name: name.value,
@@ -204,7 +204,7 @@ const createInstance = async () => {
    source: 'ProjectInstallModal',
  })

-  installModal.value.hide()
+  if (installModal.value) installModal.value.hide()
  creatingInstance.value = false
 }

--- a/theseus_gui/src/helpers/import.js
+++ b/theseus_gui/src/helpers/import.js
@@ -34,7 +34,9 @@ export async function get_importable_instances(launcherType, basePath) {
 /// eg: import_instance("profile-name-to-go-to", "MultiMC", "C:/MultiMC", "Instance 1")
 export async function import_instance(launcherType, basePath, instanceFolder) {
  // create a basic, empty instance (most properties will be filled in by the import process)
-  const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null)
+  // We do NOT watch the fs for changes to avoid duplicate events during installation
+  // fs watching will be enabled once the instance is imported
+  const profilePath = await create(instanceFolder, '1.19.4', 'vanilla', 'latest', null, true)

  return await invoke('plugin:import|import_import_instance', {
    profilePath,
--- a/theseus_gui/src/helpers/metadata.js
+++ b/theseus_gui/src/helpers/metadata.js
@@ -9,17 +9,23 @@ export async function get_game_versions() {
 // Gets the fabric versions from daedalus
 // Returns Manifest
 export async function get_fabric_versions() {
-  return await invoke('plugin:metadata|metadata_get_fabric_versions')
+  const c = await invoke('plugin:metadata|metadata_get_fabric_versions')
+  console.log('Getting fabric versions', c)
+  return c
 }

 // Gets the forge versions from daedalus
 // Returns Manifest
 export async function get_forge_versions() {
-  return await invoke('plugin:metadata|metadata_get_forge_versions')
+  const c = await invoke('plugin:metadata|metadata_get_forge_versions')
+  console.log('Getting forge versions', c)
+  return c
 }

 // Gets the quilt versions from daedalus
 // Returns Manifest
 export async function get_quilt_versions() {
-  return await invoke('plugin:metadata|metadata_get_quilt_versions')
+  const c = await invoke('plugin:metadata|metadata_get_quilt_versions')
+  console.log('Getting quilt versions', c)
+  return c
 }
--- a/theseus_gui/src/helpers/profile.js
+++ b/theseus_gui/src/helpers/profile.js
@@ -16,13 +16,14 @@ import { invoke } from '@tauri-apps/api/tauri'
    - icon is a path to an image file, which will be copied into the profile directory
 */

-export async function create(name, gameVersion, modloader, loaderVersion, icon) {
+export async function create(name, gameVersion, modloader, loaderVersion, icon, noWatch) {
  return await invoke('plugin:profile_create|profile_create', {
    name,
    gameVersion,
    modloader,
    loaderVersion,
    icon,
+    noWatch,
  })
 }

--- a/theseus_gui/src/pages/Browse.vue
+++ b/theseus_gui/src/pages/Browse.vue
@@ -237,22 +237,22 @@ async function refreshSearch() {

  let val = `${base}${url}`

-  const rawResults = await useFetch(val, 'search results', offline.value)
-  results.value = rawResults
+  let rawResults = await useFetch(val, 'search results', offline.value)
  if (!rawResults) {
-    results.value = {
+    rawResults = {
      hits: [],
      total_hits: 0,
      limit: 1,
    }
  }
  if (instanceContext.value) {
-    for (let val of results.value.hits) {
+    for (val of rawResults.hits) {
      val.installed = await check_installed(instanceContext.value.path, val.project_id).then(
        (x) => (val.installed = x)
      )
    }
  }
+  results.value = rawResults
 }

 async function onSearchChange(newPageNumber) {
@@ -262,7 +262,6 @@ async function onSearchChange(newPageNumber) {
    return
  }
  await refreshSearch()
-
  const obj = getSearchUrl((currentPage.value - 1) * maxResults.value, true)

  // Only replace in router if the query is different
--- a/theseus_gui/src/pages/Settings.vue
+++ b/theseus_gui/src/pages/Settings.vue
@@ -311,7 +311,16 @@ async function refreshDir() {
            customize your experience. Opting out will disable this data collection.
          </span>
        </label>
-        <Toggle id="opt-out-analytics" v-model="settings.opt_out_analytics" />
+        <Toggle
+          id="opt-out-analytics"
+          :model-value="settings.opt_out_analytics"
+          :checked="settings.opt_out_analytics"
+          @update:model-value="
+            (e) => {
+              settings.opt_out_analytics = e
+            }
+          "
+        />
      </div>
    </Card>
    <Card>
@@ -425,7 +434,7 @@ async function refreshDir() {
        <label for="fullscreen">
          <span class="label__title">Fullscreen</span>
          <span class="label__description">
-            Overwrites the option.txt file to start in full screen when launched.
+            Overwrites the options.txt file to start in full screen when launched.
          </span>
        </label>
        <Toggle
--- a/theseus_gui/src/pages/instance/Logs.vue
+++ b/theseus_gui/src/pages/instance/Logs.vue
@@ -185,12 +185,21 @@ interval.value = setInterval(async () => {
  if (logs.value.length > 0) {
    logs.value[0] = await getLiveLog()

-    if (selectedLogIndex.value === 0 && !userScrolled.value) {
-      await nextTick()
-      isAutoScrolling.value = true
-      logContainer.value.scrollTop =
-        logContainer.value.scrollHeight - logContainer.value.offsetHeight
-      setTimeout(() => (isAutoScrolling.value = false), 50)
+    // Allow resetting of userScrolled if the user scrolls to the bottom
+    if (selectedLogIndex.value === 0) {
+      if (
+        logContainer.value.scrollTop + logContainer.value.offsetHeight >=
+        logContainer.value.scrollHeight - 10
+      )
+        userScrolled.value = false
+
+      if (!userScrolled.value) {
+        await nextTick()
+        isAutoScrolling.value = true
+        logContainer.value.scrollTop =
+          logContainer.value.scrollHeight - logContainer.value.offsetHeight
+        setTimeout(() => (isAutoScrolling.value = false), 50)
+      }
    }
  }
 }, 250)
--- a/theseus_gui/src/pages/instance/Options.vue
+++ b/theseus_gui/src/pages/instance/Options.vue
@@ -204,7 +204,9 @@
    <div class="adjacent-input">
      <label for="fullscreen">
        <span class="label__title">Fullscreen</span>
-        <span class="label__description"> Make the game start in full screen when launched. </span>
+        <span class="label__description">
+          Make the game start in full screen when launched (using options.txt).
+        </span>
      </label>
      <Checkbox id="fullscreen" v-model="fullscreenSetting" :disabled="!overrideWindowSettings" />
    </div>
--- a/theseus_gui/src/pages/project/Gallery.vue
+++ b/theseus_gui/src/pages/project/Gallery.vue
@@ -50,6 +50,7 @@
            </Button>
            <a
              class="open btn icon-only"
+              target="_blank"
              :href="
                expandedGalleryItem.url
                  ? expandedGalleryItem.url
--- a/theseus_gui/src/pages/project/Version.vue
+++ b/theseus_gui/src/pages/project/Version.vue
@@ -83,12 +83,7 @@
        <Card v-if="displayDependencies.length > 0">
          <h2>Dependencies</h2>
          <div v-for="dependency in displayDependencies" :key="dependency.title">
-            <router-link
-              v-if="dependency.link"
-              class="btn dependency"
-              :to="dependency.link"
-              @click="testTest"
-            >
+            <router-link v-if="dependency.link" class="btn dependency" :to="dependency.link">
              <Avatar size="sm" :src="dependency.icon" />
              <div>
                <span class="title"> {{ dependency.title }} </span> <br />