Reverted dependency additions

Author: Devenor

package-lock.json

@@ -54,7 +54,6 @@
     "ci": "yarn install --silent --frozen-lockfile"
   },
   "dependencies": {
-    "@electron/asar": "^3.2.18",
     "@fortawesome/fontawesome-svg-core": "^6.7.2",
     "@fortawesome/free-brands-svg-icons": "^6.7.2",
     "@fortawesome/free-regular-svg-icons": "^6.7.2",
@@ -64,8 +63,6 @@
     "autolinker": "^4.1.0",
     "bgutils-js": "^3.1.3",
     "electron-context-menu": "^4.0.5",
-    "i18next": "^24.2.2",
-    "i18next-fs-backend": "^2.6.0",
     "marked": "^15.0.7",
     "path-browserify": "^1.0.1",
     "portal-vue": "^2.1.7",

package.json

@@ -4,7 +4,6 @@ const IpcChannels = {
   DISABLE_PROXY: 'disable-proxy',
   OPEN_EXTERNAL_LINK: 'open-external-link',
   GET_SYSTEM_LOCALE: 'get-system-locale',
-  GET_CURRENT_LOCALE: 'get-current-locale',
   GET_PICTURES_PATH: 'get-pictures-path',
   GET_NAVIGATION_HISTORY: 'get-navigation-history',
   SHOW_SAVE_DIALOG: 'show-save-dialog',

src/constants.js

@@ -2,7 +2,7 @@ import {
   app, BrowserWindow, dialog, Menu, ipcMain,
   powerSaveBlocker, screen, session, shell,
   nativeTheme, net, protocol, clipboard,
-  Tray
+  Tray, nativeImage
 } from 'electron'
 import path from 'path'
 import cp from 'child_process'
@@ -17,21 +17,16 @@ import {
 } from '../constants'
 import * as baseHandlers from '../datastores/handlers/base'
 import { extractExpiryTimestamp, ImageCache } from './ImageCache'
-import { existsSync, writeFileSync, mkdirSync } from 'fs'
+import { existsSync, readFileSync } from 'fs'
 import asyncFs from 'fs/promises'
 import { promisify } from 'util'
-import { brotliDecompress, brotliDecompressSync } from 'zlib'
+import { brotliDecompress } from 'zlib'
 
 import contextMenu from 'electron-context-menu'
 
 import packageDetails from '../../package.json'
 import { generatePoToken } from './poTokenGenerator'
 
-import os from 'os'
-import asar from '@electron/asar'
-
-import i18next from 'i18next'
-import Backend from 'i18next-fs-backend'
 
 const brotliDecompressAsync = promisify(brotliDecompress)
 
@@ -610,10 +605,11 @@ function runApp() {
   })
 
   function createTray() {
-    const iconPath = process.env.NODE_ENV === 'development'
-      ? path.join(__dirname, '..', '..', '_icons', 'iconColor.png')
-      : asarToTmp(path.join('_icons', 'iconColor.png'))
-    tray = new Tray(iconPath)
+    const icon = process.env.NODE_ENV === 'development'
+      ? readFileSync(path.join(__dirname, '..', '..', '_icons', 'iconColor.png'))
+      : readFileSync(path.join(path.dirname(__dirname), '_icons', 'iconColor.png'))
+
+    tray = new Tray(nativeImage.createFromBuffer(icon))
     tray.setIgnoreDoubleClickEvents(true)
 
     function click() {
@@ -623,11 +619,11 @@ function runApp() {
 
     const menu = Menu.buildFromTemplate([
       {
-        label: i18next.t('Tray.Show'),
+        label: 'Show',
         click: () => click()
       },
       {
-        label: i18next.t('Tray.Quit'),
+        label: 'Quit',
         click: handleQuit
       }
     ])
@@ -640,22 +636,6 @@ function runApp() {
     })
   }
 
-  function asarToTmp(relativePath, brotli = false) {
-    const tmpFile = path.join(os.tmpdir(), 'freetube', relativePath)
-
-    if (existsSync(tmpFile)) {
-      return tmpFile
-    } else if (!existsSync(path.dirname(tmpFile))) {
-      mkdirSync(path.dirname(tmpFile), { recursive: true })
-    }
-
-    const asarFile = asar.extractFile(path.dirname(__dirname), relativePath)
-
-    writeFileSync(tmpFile, !brotli ? asarFile : brotliDecompressSync(asarFile))
-
-    return tmpFile
-  }
-
   /**
    * @param {string} extension
    */
@@ -935,21 +915,6 @@ function runApp() {
     startupUrl = null
   })
 
-  ipcMain.on(IpcChannels.GET_CURRENT_LOCALE, (_, { targetLocale, fallbackLocale }) => {
-    i18next.use(Backend).init({
-      lng: targetLocale,
-      fallbackLng: fallbackLocale,
-      backend: {
-        loadPath: process.env.NODE_ENV === 'development'
-          ? path.join(__dirname, '..', '..', 'static', 'locales', '{{lng}}.yaml')
-          : asarToTmp(path.join('dist', 'static', 'locales', targetLocale + '.json.br'), true)
-      },
-      interpolation: {
-        escapeValue: false
-      }
-    })
-  })
-
   function relaunch() {
     if (process.env.NODE_ENV === 'development') {
       app.exit(parseInt(process.env.FREETUBE_RELAUNCH_EXIT_CODE))

src/main/index.js

@@ -381,9 +381,6 @@ const sideEffectHandlers = {
 
     i18n.locale = targetLocale
     await dispatch('getRegionData', targetLocale)
-
-    const { ipcRenderer } = require('electron')
-    ipcRenderer.send(IpcChannels.GET_CURRENT_LOCALE, { targetLocale, fallbackLocale })
   },
 
   defaultInvidiousInstance: ({ commit, rootState }, value) => {

src/renderer/store/modules/settings.js

@@ -1205,6 +1205,3 @@ KeyboardShortcutPrompt:
   Last Chapter: Last Chapter
   Next Chapter: Next Chapter
   Skip by Tenths: Skip through video by percentage (3 skips to 30% of duration)
-Tray:
-  Show: Show
-  Quit: Quit

static/locales/en-US.yaml

@@ -1238,6 +1238,3 @@ Description:
   Collapse Description: Mostrar menos
 KeyboardShortcutPrompt:
   New Window: Crear una nueva ventana
-Tray:
-  Show: Mostrar
-  Quit: Salir