* Disallow installer version to use new setting

Author: PikachuEXE

_scripts/ebuilder.config.mjs

@@ -94,6 +94,5 @@ export default {
   nsis: {
     allowToChangeInstallationDirectory: true,
     oneClick: false,
-    include: '_scripts/ebuilder.nsis.installer.nsh',
   },
 }

_scripts/ebuilder.nsis.installer.nsh

@@ -1,4 +1,5 @@
 // IPC Channels
+
 const IpcChannels = {
   ENABLE_PROXY: 'enable-proxy',
   DISABLE_PROXY: 'disable-proxy',
@@ -46,7 +47,8 @@ const IpcChannels = {
   CHOOSE_DEFAULT_FOLDER: 'choose-default-folder',
   WRITE_TO_DEFAULT_FOLDER: 'write-to-default-folder',
 
-  GET_STORE_USER_DATA_IN_APP_FOLDER: 'get-store-user-data-in-app-folder',
+  GET_STORE_USER_DATA_IN_APP_FOLDER_ALLOWED: 'get-store-user-data-in-app-folder-allowed',
+  GET_STORE_USER_DATA_IN_APP_FOLDER_ENABLED: 'get-store-user-data-in-app-folder-enabled',
   TOGGLE_STORE_USER_DATA_IN_APP_FOLDER: 'toggle-store-user-data-in-app-folder',
 }
 

src/constants.js

@@ -7,10 +7,9 @@ if (process.env.IS_ELECTRON_MAIN) {
   // this code only runs in the electron main process, so hopefully using sync fs code here should be fine 😬
   const { statSync, realpathSync } = require('fs')
 
-  const { getUserDataPath } = require('../main/userDataFolder')
-  const userDataPath = getUserDataPath()
+  const { USER_DATA_PATH } = require('../main/userDataFolder')
   dbPath = (dbName) => {
-    let path = join(userDataPath, `${dbName}.db`)
+    let path = join(USER_DATA_PATH, `${dbName}.db`)
 
     // returns undefined if the path doesn't exist
     if (statSync(path, { throwIfNoEntry: false })?.isSymbolicLink) {

src/datastores/index.js

@@ -27,8 +27,9 @@ import contextMenu from 'electron-context-menu'
 import packageDetails from '../../package.json'
 import { generatePoToken } from './poTokenGenerator'
 import {
-  getStoreUserDataInAppFolderEnabled,
-  getUserDataPath,
+  STORE_USER_DATA_IN_APP_FOLDER_ALLOWED,
+  STORE_USER_DATA_IN_APP_FOLDER_ENABLED,
+  USER_DATA_PATH,
   toggleStoreUserDataInAppFolderEnabledAndMigrateFiles,
 } from './userDataFolder'
 
@@ -279,13 +280,10 @@ function runApp() {
   let mainWindow
   let startupUrl
 
-  const userDataPath = getUserDataPath()
-  const storeUserDataInAppFolderEnabled = getStoreUserDataInAppFolderEnabled()
-
   // command line switches need to be added before the app ready event first
   // that means we can't use the normal settings system as that is asynchronous,
   // doing it synchronously ensures that we add it before the event fires
-  const REPLACE_HTTP_CACHE_PATH = `${userDataPath}/experiment-replace-http-cache`
+  const REPLACE_HTTP_CACHE_PATH = `${USER_DATA_PATH}/experiment-replace-http-cache`
   const replaceHttpCache = existsSync(REPLACE_HTTP_CACHE_PATH)
   if (replaceHttpCache) {
     // the http cache causes excessive disk usage during video playback
@@ -1263,8 +1261,12 @@ function runApp() {
     relaunch()
   })
 
-  ipcMain.handle(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER, () => {
-    return storeUserDataInAppFolderEnabled
+  ipcMain.handle(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER_ALLOWED, () => {
+    return STORE_USER_DATA_IN_APP_FOLDER_ALLOWED
+  })
+
+  ipcMain.handle(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER_ENABLED, () => {
+    return STORE_USER_DATA_IN_APP_FOLDER_ENABLED
   })
 
   ipcMain.once(IpcChannels.TOGGLE_STORE_USER_DATA_IN_APP_FOLDER, async () => {

src/main/index.js

@@ -22,18 +22,18 @@ const TO_BE_MIGRATED_FILES = [
   'subscription-cache.db',
   'experiment-replace-http-cache',
 ]
-
-export function getUserDataPath() {
-  return getStoreUserDataInAppFolderEnabled() ? APP_FOLDER_USER_DATA_PATH : DEFAULT_USER_DATA_PATH
-}
-
-export function getStoreUserDataInAppFolderEnabled() {
-  return process.platform === 'win32' && existsSync(USER_DATA_IN_APP_FOLDER_SWITCH_FILE_PATH)
-}
+// Windows & NOT installer version & flag file exists
+export const STORE_USER_DATA_IN_APP_FOLDER_ALLOWED =
+  process.platform === 'win32' &&
+  !existsSync(path.join(path.dirname(process.execPath), 'Uninstall FreeTube.exe'))
+export const STORE_USER_DATA_IN_APP_FOLDER_ENABLED =
+  STORE_USER_DATA_IN_APP_FOLDER_ALLOWED &&
+  existsSync(USER_DATA_IN_APP_FOLDER_SWITCH_FILE_PATH)
+export const USER_DATA_PATH = STORE_USER_DATA_IN_APP_FOLDER_ENABLED ? APP_FOLDER_USER_DATA_PATH : DEFAULT_USER_DATA_PATH
 
 export async function toggleStoreUserDataInAppFolderEnabledAndMigrateFiles() {
   // Migrate files first, only toggle setting when migration successful
-  if (getStoreUserDataInAppFolderEnabled()) {
+  if (STORE_USER_DATA_IN_APP_FOLDER_ENABLED) {
     await migrateFilesFromHereToThere(APP_FOLDER_USER_DATA_PATH, DEFAULT_USER_DATA_PATH)
     await asyncFs.rm(USER_DATA_IN_APP_FOLDER_SWITCH_FILE_PATH)
   } else {

src/main/userDataFolder.js

@@ -73,8 +73,15 @@ export default {
   /**
    * @returns {Promise<boolean>}
    */
-  getStoreUserDataInAppFolder: () => {
-    return ipcRenderer.invoke(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER)
+  getStoreUserDataInAppFolderAllowed: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER_ALLOWED)
+  },
+
+  /**
+   * @returns {Promise<boolean>}
+   */
+  getStoreUserDataInAppFolderEnabled: () => {
+    return ipcRenderer.invoke(IpcChannels.GET_STORE_USER_DATA_IN_APP_FOLDER_ENABLED)
   },
 
   toggleStoreUserDataInAppFolder: () => {

src/preload/interface.js

@@ -16,12 +16,12 @@
         @change="handleReplaceHttpCacheChange"
       />
     </FtFlexBox>
-    <FtFlexBox v-if="storeUserDataInAppFolderAllowedOnPlatform">
+    <FtFlexBox v-if="storeUserDataInAppFolderAllowed">
       <FtToggleSwitch
         tooltip-position="top"
         :label="$t('Settings.Experimental Settings.Store User Data In App Folder.Label')"
         compact
-        :default-value="storeUserDataInAppFolder"
+        :default-value="storeUserDataInAppFolderEnabled"
         :disabled="settingValuesLoading"
         :tooltip="$t('Settings.Experimental Settings.Store User Data In App Folder.Tooltip')"
         @change="handleStoreUserDataInAppFolderChange"
@@ -47,10 +47,10 @@ import FtPrompt from '../FtPrompt/FtPrompt.vue'
 
 const settingValuesLoading = ref(true)
 const replaceHttpCache = ref(false)
-const storeUserDataInAppFolder = ref(false)
+const storeUserDataInAppFolderEnabled = ref(false)
 const showRestartPrompt = ref(false)
 
-const storeUserDataInAppFolderAllowedOnPlatform = process.platform === 'win32'
+const storeUserDataInAppFolderAllowed = ref(false)
 
 const NextActions = {
   // Simply use 1-N unique values
@@ -64,8 +64,9 @@ let nextAction = NextActions.NOTHING
 onMounted(async () => {
   if (process.env.IS_ELECTRON) {
     replaceHttpCache.value = await window.ftElectron.getReplaceHttpCache()
-    if (storeUserDataInAppFolderAllowedOnPlatform) {
-      storeUserDataInAppFolder.value = await window.ftElectron.getStoreUserDataInAppFolder()
+    storeUserDataInAppFolderAllowed.value = await window.ftElectron.getStoreUserDataInAppFolderAllowed()
+    if (storeUserDataInAppFolderAllowed.value) {
+      storeUserDataInAppFolderEnabled.value = await window.ftElectron.getStoreUserDataInAppFolderEnabled()
     }
   }
 
@@ -85,7 +86,7 @@ function handleReplaceHttpCacheChange(value) {
  * @param {boolean} value
  */
 function handleStoreUserDataInAppFolderChange(value) {
-  storeUserDataInAppFolder.value = value
+  storeUserDataInAppFolderEnabled.value = value
   nextAction = NextActions.TOGGLE_STORE_USER_DATA_IN_APP_FOLDER
   showRestartPrompt.value = true
 }
@@ -110,7 +111,7 @@ function handleRestartPromptClick(value) {
     }
     case NextActions.TOGGLE_STORE_USER_DATA_IN_APP_FOLDER: {
       if (value === null || value === 'cancel') {
-        storeUserDataInAppFolder.value = !storeUserDataInAppFolder.value
+        storeUserDataInAppFolderEnabled.value = !storeUserDataInAppFolderEnabled.value
         return
       }