Analytics + more bug fixes (#144)

* Analytics + more bug fixes * debug deadlock * Fix mostly everything * merge fixes * fix rest * final fixeS
2023-06-19 14:59:06 -07:00
parent 84d731b670
commit 1e78a7b6a8
51 changed files with 1285 additions and 491 deletions
--- a/theseus_gui/src/pages/instance/Index.vue
+++ b/theseus_gui/src/pages/instance/Index.vue
@@ -25,7 +25,7 @@
            v-else-if="playing === true"
            color="danger"
            class="instance-button"
-            @click="stopInstance"
+            @click="stopInstance('InstancePage')"
            @mouseover="checkProcess"
          >
            <StopCircleIcon />
@@ -35,7 +35,7 @@
            v-else-if="playing === false && loading === false"
            color="primary"
            class="instance-button"
-            @click="startInstance"
+            @click="startInstance('InstancePage')"
            @mouseover="checkProcess"
          >
            <PlayIcon />
@@ -93,8 +93,6 @@
    <template #open_folder> <ClipboardCopyIcon /> Open Folder </template>
    <template #copy_link> <ClipboardCopyIcon /> Copy Link </template>
    <template #open_link> <ClipboardCopyIcon /> Open In Modrinth <ExternalIcon /> </template>
-    <template #repair> <HammerIcon /> Repair </template>
-    <template #delete> <TrashIcon /> Delete </template>
  </ContextMenu>
 </template>
 <script setup>
@@ -109,14 +107,12 @@ import {
  PlayIcon,
  StopCircleIcon,
  EditIcon,
-  HammerIcon,
-  TrashIcon,
  FolderOpenIcon,
  ClipboardCopyIcon,
  PlusIcon,
  ExternalIcon,
 } from 'omorphia'
-import { get, install, remove, run } from '@/helpers/profile'
+import { get, run } from '@/helpers/profile'
 import {
  get_all_running_profile_paths,
  get_uuids_by_profile_path,
@@ -129,6 +125,7 @@ import { convertFileSrc } from '@tauri-apps/api/tauri'
 import { handleError, useBreadcrumbs, useLoading } from '@/store/state'
 import { showInFolder } from '@/helpers/utils.js'
 import ContextMenu from '@/components/ui/ContextMenu.vue'
+import mixpanel from 'mixpanel-browser'

 const route = useRoute()

@@ -151,11 +148,17 @@ const playing = ref(false)
 const loading = ref(false)
 const options = ref(null)

-const startInstance = async () => {
+const startInstance = async (context) => {
  loading.value = true
  uuid.value = await run(route.params.id).catch(handleError)
  loading.value = false
  playing.value = true
+
+  mixpanel.track('InstanceStart', {
+    loader: instance.value.metadata.loader,
+    game_version: instance.value.metadata.game_version,
+    source: context,
+  })
 }

 const checkProcess = async () => {
@@ -171,25 +174,21 @@ const checkProcess = async () => {

 await checkProcess()

-const stopInstance = async () => {
+const stopInstance = async (context) => {
  playing.value = false
  if (!uuid.value) {
    const uuids = await get_uuids_by_profile_path(instance.value.path).catch(handleError)
    uuid.value = uuids[0] // populate Uuid to listen for in the process_listener
    uuids.forEach(async (u) => await kill_by_uuid(u).catch(handleError))
  } else await kill_by_uuid(uuid.value).catch(handleError)
+
+  mixpanel.track('InstanceStop', {
+    loader: instance.value.metadata.loader,
+    game_version: instance.value.metadata.game_version,
+    source: context,
+  })
 }

-const unlistenProfiles = await profile_listener(async (event) => {
-  if (event.path === route.params.id) {
-    instance.value = await get(route.params.id).catch(handleError)
-  }
-})
-
-const unlistenProcesses = await process_listener((e) => {
-  if (e.event === 'finished' && uuid.value === e.uuid) playing.value = false
-})
-
 const handleRightClick = (event) => {
  const baseOptions = [
    { name: 'add_content' },
@@ -197,15 +196,6 @@ const handleRightClick = (event) => {
    { name: 'edit' },
    { name: 'open_folder' },
    { name: 'copy_path' },
-    { type: 'divider' },
-    {
-      name: 'repair',
-      color: 'contrast',
-    },
-    {
-      name: 'delete',
-      color: 'danger',
-    },
  ]

  options.value.showMenu(
@@ -233,10 +223,10 @@ const handleOptionsClick = async (args) => {
  console.log(args)
  switch (args.option) {
    case 'play':
-      await startInstance()
+      await startInstance('InstancePageContextMenu')
      break
    case 'stop':
-      await stopInstance()
+      await stopInstance('InstancePageContextMenu')
      break
    case 'add_content':
      await router.push({
@@ -249,33 +239,25 @@ const handleOptionsClick = async (args) => {
        path: `/instance/${encodeURIComponent(route.params.id)}/options`,
      })
      break
-    case 'repair':
-      await install(instance.value.path).catch(handleError)
-      break
-    case 'delete':
-      await remove(instance.value.path).catch(handleError)
-      break
    case 'open_folder':
      await showInFolder(instance.value.path)
      break
    case 'copy_path':
      await navigator.clipboard.writeText(instance.value.path)
      break
-    case 'open_link':
-      window.__TAURI_INVOKE__('tauri', {
-        __tauriModule: 'Shell',
-        message: {
-          cmd: 'open',
-          path: args.item.link,
-        },
-      })
-      break
-    case 'copy_link':
-      await navigator.clipboard.writeText(args.item.link)
-      break
  }
 }

+const unlistenProfiles = await profile_listener(async (event) => {
+  if (event.path === route.params.id) {
+    instance.value = await get(route.params.id).catch(handleError)
+  }
+})
+
+const unlistenProcesses = await process_listener((e) => {
+  if (e.event === 'finished' && uuid.value === e.uuid) playing.value = false
+})
+
 onUnmounted(() => {
  unlistenProcesses()
  unlistenProfiles()
--- a/theseus_gui/src/pages/instance/Logs.vue
+++ b/theseus_gui/src/pages/instance/Logs.vue
@@ -51,11 +51,11 @@ import {
  SendIcon,
  TrashIcon,
 } from 'omorphia'
-import { delete_logs_by_datetime, get_logs, get_stdout_by_datetime } from '@/helpers/logs.js'
+import { delete_logs_by_datetime, get_logs, get_output_by_datetime } from '@/helpers/logs.js'
 import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue'
 import dayjs from 'dayjs'
 import calendar from 'dayjs/plugin/calendar'
-import { get_stdout_by_uuid, get_uuids_by_profile_path } from '@/helpers/process.js'
+import { get_output_by_uuid, get_uuids_by_profile_path } from '@/helpers/process.js'
 import { useRoute } from 'vue-router'
 import { process_listener } from '@/helpers/events.js'
 import { handleError } from '@/store/notifications.js'
@@ -78,7 +78,7 @@ async function getLiveLog() {
    if (uuids.length === 0) {
      returnValue = 'No live game detected. \nStart your game to proceed'
    } else {
-      returnValue = await get_stdout_by_uuid(uuids[0]).catch(handleError)
+      returnValue = await get_output_by_uuid(uuids[0]).catch(handleError)
    }

    return { name: 'Live Log', stdout: returnValue, live: true }
@@ -120,13 +120,17 @@ watch(selectedLogIndex, async (newIndex) => {

  if (newIndex !== 0) {
    logs.value[newIndex].stdout = 'Loading...'
-    logs.value[newIndex].stdout = await get_stdout_by_datetime(
+    logs.value[newIndex].stdout = await get_output_by_datetime(
      props.instance.uuid,
      logs.value[newIndex].datetime_string
    ).catch(handleError)
  }
 })

+if (logs.value.length >= 1) {
+  selectedLogIndex.value = 1
+}
+
 const deleteLog = async () => {
  if (logs.value[selectedLogIndex.value] && selectedLogIndex.value !== 0) {
    let deleteIndex = selectedLogIndex.value
@@ -165,9 +169,13 @@ interval.value = setInterval(async () => {
 }, 250)

 const unlistenProcesses = await process_listener(async (e) => {
+  if (e.event === 'launched') {
+    selectedLogIndex.value = 0
+  }
  if (e.event === 'finished') {
    userScrolled.value = false
    await setLogs()
+    selectedLogIndex.value = 1
  }
 })

--- a/theseus_gui/src/pages/instance/Mods.vue
+++ b/theseus_gui/src/pages/instance/Mods.vue
@@ -37,7 +37,7 @@
        >
          <template #search>
            <SearchIcon />
-            <span class="no-wrap"> Search addons </span>
+            <span class="no-wrap"> Add content </span>
          </template>
          <template #from_file>
            <FolderOpenIcon />
@@ -216,6 +216,7 @@ import {
  update_project,
 } from '@/helpers/profile.js'
 import { handleError } from '@/store/notifications.js'
+import mixpanel from 'mixpanel-browser'
 import { open } from '@tauri-apps/api/dialog'
 import { listen } from '@tauri-apps/api/event'

@@ -255,6 +256,7 @@ const initProjects = (initInstance) => {
        updateVersion: project.metadata.update_version,
        outdated: !!project.metadata.update_version,
        project_type: project.metadata.project.project_type,
+        id: project.metadata.project.id,
      })
    } else if (project.metadata.type === 'inferred') {
      projects.value.push({
@@ -286,6 +288,11 @@ const initProjects = (initInstance) => {

 initProjects(props.instance)

+watch(
+  () => props.instance.projects,
+  () => initProjects(props.instance)
+)
+
 const searchFilter = ref('')
 const selectAll = ref(false)
 const sortFilter = ref('')
@@ -385,6 +392,13 @@ async function updateAll() {
  for (const project of setProjects) {
    projects.value[project].updating = false
  }
+
+  mixpanel.track('InstanceUpdateAll', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+    count: setProjects.length,
+    selected: selected.value.length > 1,
+  })
 }

 async function updateProject(mod) {
@@ -395,30 +409,54 @@ async function updateProject(mod) {
  mod.outdated = false
  mod.version = mod.updateVersion.version_number
  mod.updateVersion = null
+
+  mixpanel.track('InstanceProjectUpdate', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+    id: mod.id,
+    name: mod.name,
+    project_type: mod.project_type,
+  })
 }

 async function toggleDisableMod(mod) {
  mod.path = await toggle_disable_project(props.instance.path, mod.path).catch(handleError)
  mod.disabled = !mod.disabled
+
+  mixpanel.track('InstanceProjectDisable', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+    id: mod.id,
+    name: mod.name,
+    project_type: mod.project_type,
+    disabled: mod.disabled,
+  })
 }

 async function removeMod(mod) {
  await remove_project(props.instance.path, mod.path).catch(handleError)
  projects.value = projects.value.filter((x) => mod.path !== x.path)
+
+  mixpanel.track('InstanceProjectRemove', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+    id: mod.id,
+    name: mod.name,
+    project_type: mod.project_type,
+  })
 }

 const handleContentOptionClick = async (args) => {
  if (args.option === 'search') {
    await router.push({
      path: `/browse/${props.instance.metadata.loader === 'vanilla' ? 'datapack' : 'mod'}`,
+      query: { i: props.instance.path },
    })
  } else if (args.option === 'from_file') {
    const newProject = await open({ multiple: true })
-    console.log(newProject)
    if (!newProject) return

    for (const project of newProject) {
-      console.log(project)
      await add_project_from_path(props.instance.path, project, 'mod').catch(handleError)
      initProjects(await get(props.instance.path).catch(handleError))
    }
--- a/theseus_gui/src/pages/instance/Options.vue
+++ b/theseus_gui/src/pages/instance/Options.vue
@@ -5,9 +5,14 @@
    description="If you proceed, all data for your instance will be removed. You will not be able to recover it."
    :has-to-type="false"
    proceed-label="Delete"
+    :noblur="!themeStore.advancedRendering"
    @proceed="removeProfile"
  />
-  <Modal ref="changeVersionsModal" header="Change instance versions">
+  <Modal
+    ref="changeVersionsModal"
+    header="Change instance versions"
+    :noblur="!themeStore.advancedRendering"
+  >
    <div class="change-versions-modal universal-body">
      <div class="input-row">
        <p class="input-label">Loader</p>
@@ -334,6 +339,8 @@ import { open } from '@tauri-apps/api/dialog'
 import { get_fabric_versions, get_forge_versions, get_quilt_versions } from '@/helpers/metadata.js'
 import { get_game_versions, get_loaders } from '@/helpers/tags.js'
 import { handleError } from '@/store/notifications.js'
+import mixpanel from 'mixpanel-browser'
+import { useTheming } from '@/store/theme.js'

 const router = useRouter()

@@ -344,6 +351,8 @@ const props = defineProps({
  },
 })

+const themeStore = useTheming()
+
 const title = ref(props.instance.metadata.name)
 const icon = ref(props.instance.metadata.icon)
 const groups = ref(props.instance.metadata.groups)
@@ -360,6 +369,7 @@ const availableGroups = ref([
 async function resetIcon() {
  icon.value = null
  await edit_icon(props.instance.path, null).catch(handleError)
+  mixpanel.track('InstanceRemoveIcon')
 }

 async function setIcon() {
@@ -377,6 +387,8 @@ async function setIcon() {

  icon.value = value
  await edit_icon(props.instance.path, icon.value).catch(handleError)
+
+  mixpanel.track('InstanceSetIcon')
 }

 const globalSettings = await get().catch(handleError)
@@ -428,6 +440,7 @@ watch(
      metadata: {
        name: title.value.trim().substring(0, 16) ?? 'Instance',
        groups: groups.value.map((x) => x.trim().substring(0, 32)).filter((x) => x.length > 0),
+        loader_version: props.instance.metadata.loader_version,
      },
      java: {},
    }
@@ -481,6 +494,11 @@ async function repairProfile() {
  repairing.value = true
  await install(props.instance.path).catch(handleError)
  repairing.value = false
+
+  mixpanel.track('InstanceRepair', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+  })
 }

 const removing = ref(false)
@@ -489,6 +507,11 @@ async function removeProfile() {
  await remove(props.instance.path).catch(handleError)
  removing.value = false

+  mixpanel.track('InstanceRemove', {
+    loader: props.instance.metadata.loader,
+    game_version: props.instance.metadata.game_version,
+  })
+
  await router.push({ path: '/' })
 }