{{ $t('Channel.About.Details') }}
| {{ formattedViews }} | +|
| + {{ $t('Global.Videos') }} + | +{{ formattedVideos }} | +
|---|---|
@@ -21,17 +21,20 @@ Available for Windows, Mac & Linux thanks to Electron.
Website • Blog • Documentation • FAQ • Discussions
## How does it work?
FreeTube uses a built in extractor to grab and serve data / videos. The [Invidious API](https://github.com/iv-org/invidious) can also optionally be used. FreeTube does not use any official APIs to obtain data. While YouTube can still see your video requests, it can no
-longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out. Using a VPN or Tor is highly recommended
-to hide your IP while using FreeTube.
+longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out.
+
+> [!IMPORTANT]
+> Using a VPN or Tor is highly recommended to hide your IP while using FreeTube.
## Features
* Watch videos without ads
@@ -59,16 +62,26 @@ to hide your IP while using FreeTube.
* View most age restricted videos
### Browser Extension
-FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings of the extension for it to work.
+FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube.
+
+> [!IMPORTANT]
+> You must enable the option within the advanced settings of the extension for it to work.
* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://libredirect.github.io/download_chromium.html).
-If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository. This extension does not work on Linux portable builds!
+> [!NOTE]
+> This extension does not work on Linux portable builds!
+>
+> If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
## Download Links
### Official Downloads
+
+> [!CAUTION]
+> FreeTube is only supported on Windows 10 and later, macOS 10.15 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
+
* [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
* [FreeTube Website](https://freetubeapp.io/#download)
@@ -76,18 +89,27 @@ If you have issues with the extension working with FreeTube, please create an is
* Flatpak on Flathub: [Download](https://flathub.org/apps/details/io.freetubeapp.FreeTube) and [Source Code](https://github.com/flathub/io.freetubeapp.FreeTube)
#### Automated Builds (Nightly / Weekly)
+> [!WARNING]
+> Use these builds at your own risk. These are pre-release versions and are only intended for people that want to test changes early and are willing to accept that things could break from one build to another.
+
Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).
-The first build with a green check mark is the latest build. You will need to have a GitHub account to download these builds.
+The first build with a green check mark is the latest build.
+
+> [!IMPORTANT]
+> You will need to have a GitHub account to download these builds.
### Unofficial Downloads
-These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer. Make sure u always try an [official download](https://github.com/freetubeapp/freetube/#official-downloads) before reporting your issue to us!
+> [!WARNING]
+> These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer. Make sure u always try an [official download](https://github.com/freetubeapp/freetube/#official-downloads) before reporting your issue to us!
* Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)
* Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
-* FreeTubeCordova (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeCordova/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeCordova)
+* FreeTubeAndroid (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeAndroid/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeAndroid)
+
+* Homebrew Formulae (Mac only): [Download](https://formulae.brew.sh/cask/freetube)
* makedeb Package Repository (MPR): [Download](https://mpr.makedeb.org/packages/freetube-bin)
@@ -97,18 +119,20 @@ These builds are maintained by the community. While they should be safe, downloa
* Scoop (Windows Only): [Usage](https://github.com/ScoopInstaller/Scoop)
-* Snap: [Download](https://snapcraft.io/freetube-snap) and [Source Code](https://launchpad.net/freetube)
+* Snap: [Download](https://snapcraft.io/freetube) and [Source Code](https://git.launchpad.net/freetube)
+
+* WAPT: [Download](https://wapt.tranquil.it/store/tis-freetube)
* Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
## Contributing
+Thank you very much to the [People and Projects](https://docs.freetubeapp.io/credits/) that make FreeTube possible!
+
If you like to get your hands dirty and want to contribute, we would love to
-have your help. Send a pull request and someone will review your code. Please
-follow the [Contribution
-Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/development/CONTRIBUTING.md)
-before sending your pull request.
+have your help. Send a pull request and someone will review your code.
-Thank you very much to the [People and Projects](https://docs.freetubeapp.io/credits/) that make FreeTube possible!
+> [!IMPORTANT]
+> Please follow the [Contribution Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/development/CONTRIBUTING.md) before sending your pull request.
## Localization
@@ -120,7 +144,10 @@ We are actively looking for translations! We use [Weblate](https://hosted.webla
For the Linux Flatpak, the desktop entry comment string can be translated at our [Flatpak repository](https://github.com/flathub/io.freetubeapp.FreeTube/blob/master/io.freetubeapp.FreeTube.desktop).
## Contact
-If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
+If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org).
+
+> [!IMPORTANT]
+> Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
## Donate
If you enjoy using FreeTube, you're welcome to leave a donation using the following methods.
@@ -131,7 +158,10 @@ If you enjoy using FreeTube, you're welcome to leave a donation using the follow
* Monero Address: `48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB`
-While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs. If you are using the Invidious API then we recommend that you donate to the instance that you use. You can also donate to the [Invidious team](https://invidious.io/donate/) or the [Local API developer](https://github.com/sponsors/LuanRT).
+While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs.
+
+> [!TIP]
+> If you are using the Invidious API then we recommend that you donate to the instance that you use. You can also donate to the [Invidious team](https://invidious.io/donate/) or the [Local API developer](https://github.com/sponsors/LuanRT).
## License
[](https://www.gnu.org/licenses/agpl-3.0.html)
diff --git a/_icons/icon.ico b/_icons/icon.ico
index cb73bbb4c7922..4d18cd5f545ca 100644
Binary files a/_icons/icon.ico and b/_icons/icon.ico differ
diff --git a/_icons/iconBlack.png b/_icons/iconBlack.png
deleted file mode 100644
index 1663986267da7..0000000000000
Binary files a/_icons/iconBlack.png and /dev/null differ
diff --git a/_icons/iconBlack.svg b/_icons/iconBlack.svg
new file mode 100644
index 0000000000000..09822b399508e
--- /dev/null
+++ b/_icons/iconBlack.svg
@@ -0,0 +1,3 @@
+
diff --git a/_icons/iconBlackSmall.png b/_icons/iconBlackSmall.png
deleted file mode 100644
index 04528fd490505..0000000000000
Binary files a/_icons/iconBlackSmall.png and /dev/null differ
diff --git a/_icons/iconBlackSmall.svg b/_icons/iconBlackSmall.svg
new file mode 100644
index 0000000000000..6be52ec3a9775
--- /dev/null
+++ b/_icons/iconBlackSmall.svg
@@ -0,0 +1,3 @@
+
diff --git a/_icons/iconCatppuccinMochaDarkSmall.png b/_icons/iconCatppuccinMochaDarkSmall.png
deleted file mode 100644
index c963e8a0e823f..0000000000000
Binary files a/_icons/iconCatppuccinMochaDarkSmall.png and /dev/null differ
diff --git a/_icons/iconCatppuccinMochaDarkSmall.svg b/_icons/iconCatppuccinMochaDarkSmall.svg
new file mode 100644
index 0000000000000..a9cdbea80ea05
--- /dev/null
+++ b/_icons/iconCatppuccinMochaDarkSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconCatppuccinMochaLightSmall.png b/_icons/iconCatppuccinMochaLightSmall.png
deleted file mode 100644
index 618b08e2916ae..0000000000000
Binary files a/_icons/iconCatppuccinMochaLightSmall.png and /dev/null differ
diff --git a/_icons/iconCatppuccinMochaLightSmall.svg b/_icons/iconCatppuccinMochaLightSmall.svg
new file mode 100644
index 0000000000000..f5e1d9d43b57a
--- /dev/null
+++ b/_icons/iconCatppuccinMochaLightSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconColor.png b/_icons/iconColor.png
index 191266143368e..300d763f9373d 100644
Binary files a/_icons/iconColor.png and b/_icons/iconColor.png differ
diff --git a/_icons/iconColor.svg b/_icons/iconColor.svg
new file mode 100644
index 0000000000000..1821fcad86fb9
--- /dev/null
+++ b/_icons/iconColor.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconColorSmall.png b/_icons/iconColorSmall.png
deleted file mode 100644
index fd0060151726c..0000000000000
Binary files a/_icons/iconColorSmall.png and /dev/null differ
diff --git a/_icons/iconColorSmall.svg b/_icons/iconColorSmall.svg
new file mode 100644
index 0000000000000..c8e25b369d568
--- /dev/null
+++ b/_icons/iconColorSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconDraculaDarkSmall.png b/_icons/iconDraculaDarkSmall.png
deleted file mode 100644
index 5b515c64960e9..0000000000000
Binary files a/_icons/iconDraculaDarkSmall.png and /dev/null differ
diff --git a/_icons/iconDraculaDarkSmall.svg b/_icons/iconDraculaDarkSmall.svg
new file mode 100644
index 0000000000000..9a01efc1b3818
--- /dev/null
+++ b/_icons/iconDraculaDarkSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconDraculaLightSmall.png b/_icons/iconDraculaLightSmall.png
deleted file mode 100644
index e497925fb76ab..0000000000000
Binary files a/_icons/iconDraculaLightSmall.png and /dev/null differ
diff --git a/_icons/iconDraculaLightSmall.svg b/_icons/iconDraculaLightSmall.svg
new file mode 100644
index 0000000000000..1c2212ac474cf
--- /dev/null
+++ b/_icons/iconDraculaLightSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconNordicLightSmall.svg b/_icons/iconNordicLightSmall.svg
new file mode 100644
index 0000000000000..8b5cbd2dc3049
--- /dev/null
+++ b/_icons/iconNordicLightSmall.svg
@@ -0,0 +1,4 @@
+
diff --git a/_icons/iconWhite.png b/_icons/iconWhite.png
deleted file mode 100644
index 38f58b591df9a..0000000000000
Binary files a/_icons/iconWhite.png and /dev/null differ
diff --git a/_icons/iconWhite.svg b/_icons/iconWhite.svg
new file mode 100644
index 0000000000000..bd0595084c1af
--- /dev/null
+++ b/_icons/iconWhite.svg
@@ -0,0 +1,3 @@
+
diff --git a/_icons/iconWhiteSmall.svg b/_icons/iconWhiteSmall.svg
new file mode 100644
index 0000000000000..859901456a528
--- /dev/null
+++ b/_icons/iconWhiteSmall.svg
@@ -0,0 +1,3 @@
+
diff --git a/_icons/logoBlack.svg b/_icons/logoBlack.svg
new file mode 100644
index 0000000000000..8d167add15645
--- /dev/null
+++ b/_icons/logoBlack.svg
@@ -0,0 +1,193 @@
+
+
+
diff --git a/_icons/logoColor.svg b/_icons/logoColor.svg
new file mode 100644
index 0000000000000..35d5e45a8a65d
--- /dev/null
+++ b/_icons/logoColor.svg
@@ -0,0 +1,224 @@
+
+
+
diff --git a/_icons/logoWhite.svg b/_icons/logoWhite.svg
new file mode 100644
index 0000000000000..d95bc268fb171
--- /dev/null
+++ b/_icons/logoWhite.svg
@@ -0,0 +1,210 @@
+
+
+
diff --git a/_icons/textBlack.png b/_icons/textBlack.png
deleted file mode 100644
index e79196384afdf..0000000000000
Binary files a/_icons/textBlack.png and /dev/null differ
diff --git a/_icons/textBlack.svg b/_icons/textBlack.svg
new file mode 100644
index 0000000000000..bc1b89afd49e3
--- /dev/null
+++ b/_icons/textBlack.svg
@@ -0,0 +1,12 @@
+
+
+
diff --git a/_icons/textBlackSmall.png b/_icons/textBlackSmall.png
deleted file mode 100644
index 80560ba9d0a73..0000000000000
Binary files a/_icons/textBlackSmall.png and /dev/null differ
diff --git a/_icons/textBlackSmall.svg b/_icons/textBlackSmall.svg
new file mode 100644
index 0000000000000..411d37c02cd99
--- /dev/null
+++ b/_icons/textBlackSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textCatppuccinMochaDarkSmall.png b/_icons/textCatppuccinMochaDarkSmall.png
deleted file mode 100644
index c5b70b21548f2..0000000000000
Binary files a/_icons/textCatppuccinMochaDarkSmall.png and /dev/null differ
diff --git a/_icons/textCatppuccinMochaDarkSmall.svg b/_icons/textCatppuccinMochaDarkSmall.svg
new file mode 100644
index 0000000000000..ef5d976be26f2
--- /dev/null
+++ b/_icons/textCatppuccinMochaDarkSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textCatppuccinMochaLightSmall.png b/_icons/textCatppuccinMochaLightSmall.png
deleted file mode 100644
index 8a7bd5bc534a4..0000000000000
Binary files a/_icons/textCatppuccinMochaLightSmall.png and /dev/null differ
diff --git a/_icons/textCatppuccinMochaLightSmall.svg b/_icons/textCatppuccinMochaLightSmall.svg
new file mode 100644
index 0000000000000..e47d287c6cdfd
--- /dev/null
+++ b/_icons/textCatppuccinMochaLightSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textColor.png b/_icons/textColor.png
deleted file mode 100644
index bdc83759e6ece..0000000000000
Binary files a/_icons/textColor.png and /dev/null differ
diff --git a/_icons/textColor.svg b/_icons/textColor.svg
new file mode 100644
index 0000000000000..b3bb6cb3dcb61
--- /dev/null
+++ b/_icons/textColor.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textColorSmall.png b/_icons/textColorSmall.png
deleted file mode 100644
index 7a2196afffb52..0000000000000
Binary files a/_icons/textColorSmall.png and /dev/null differ
diff --git a/_icons/textColorSmall.svg b/_icons/textColorSmall.svg
new file mode 100644
index 0000000000000..c4aa40176c121
--- /dev/null
+++ b/_icons/textColorSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textDraculaDarkSmall.png b/_icons/textDraculaDarkSmall.png
deleted file mode 100644
index ae232959572db..0000000000000
Binary files a/_icons/textDraculaDarkSmall.png and /dev/null differ
diff --git a/_icons/textDraculaDarkSmall.svg b/_icons/textDraculaDarkSmall.svg
new file mode 100644
index 0000000000000..04e05e6db6549
--- /dev/null
+++ b/_icons/textDraculaDarkSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textDraculaLightSmall.png b/_icons/textDraculaLightSmall.png
deleted file mode 100644
index 219397d617a5f..0000000000000
Binary files a/_icons/textDraculaLightSmall.png and /dev/null differ
diff --git a/_icons/textDraculaLightSmall.svg b/_icons/textDraculaLightSmall.svg
new file mode 100644
index 0000000000000..1feb964f25c47
--- /dev/null
+++ b/_icons/textDraculaLightSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textNordicLightSmall.svg b/_icons/textNordicLightSmall.svg
new file mode 100644
index 0000000000000..692f9edd629d2
--- /dev/null
+++ b/_icons/textNordicLightSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textWhite.png b/_icons/textWhite.png
deleted file mode 100644
index 219397d617a5f..0000000000000
Binary files a/_icons/textWhite.png and /dev/null differ
diff --git a/_icons/textWhite.svg b/_icons/textWhite.svg
new file mode 100644
index 0000000000000..fcafdd3bd049e
--- /dev/null
+++ b/_icons/textWhite.svg
@@ -0,0 +1,10 @@
+
diff --git a/_icons/textWhiteSmall.svg b/_icons/textWhiteSmall.svg
new file mode 100644
index 0000000000000..23258dd1465d2
--- /dev/null
+++ b/_icons/textWhiteSmall.svg
@@ -0,0 +1,10 @@
+
diff --git a/_scripts/ProcessLocalesPlugin.js b/_scripts/ProcessLocalesPlugin.js
index 0d2dd681849a2..e79345e106566 100644
--- a/_scripts/ProcessLocalesPlugin.js
+++ b/_scripts/ProcessLocalesPlugin.js
@@ -1,4 +1,4 @@
-const { existsSync, readFileSync } = require('fs')
+const { existsSync, readFileSync, statSync } = require('fs')
const { brotliCompress, constants } = require('zlib')
const { promisify } = require('util')
const { load: loadYaml } = require('js-yaml')
@@ -8,6 +8,7 @@ const brotliCompressAsync = promisify(brotliCompress)
class ProcessLocalesPlugin {
constructor(options = {}) {
this.compress = !!options.compress
+ this.isIncrementalBuild = false
if (typeof options.inputDir !== 'string') {
throw new Error('ProcessLocalesPlugin: no input directory `inputDir` specified.')
@@ -21,10 +22,11 @@ class ProcessLocalesPlugin {
}
this.outputDir = options.outputDir
- this.locales = []
+ this.locales = {}
this.localeNames = []
+ this.activeLocales = []
- this.cache = []
+ this.cache = {}
this.loadLocales()
}
@@ -37,66 +39,94 @@ class ProcessLocalesPlugin {
compilation.hooks.additionalAssets.tapPromise('process-locales-plugin', async (_assets) => {
- // While running in the webpack dev server, this hook gets called for every incrememental build.
+ // While running in the webpack dev server, this hook gets called for every incremental build.
// For incremental builds we can return the already processed versions, which saves time
// and makes webpack treat them as cached
- if (IS_DEV_SERVER && this.cache.length > 0) {
- for (const { filename, source } of this.cache) {
- compilation.emitAsset(filename, source, { minimized: true })
- }
+ const promises = []
+ // Prevents `loadLocales` called twice on first time (e.g. release build)
+ if (this.isIncrementalBuild) {
+ this.loadLocales(true)
} else {
- const promises = []
+ this.isIncrementalBuild = true
+ }
- for (const { locale, data } of this.locales) {
- promises.push(new Promise(async (resolve) => {
- if (Object.prototype.hasOwnProperty.call(data, 'Locale Name')) {
- delete data['Locale Name']
- }
+ Object.values(this.locales).forEach((localeEntry) => {
+ const { locale, data, mtimeMs } = localeEntry
- this.removeEmptyValues(data)
+ promises.push(new Promise(async (resolve) => {
+ if (IS_DEV_SERVER) {
+ const cacheEntry = this.cache[locale]
- let filename = `${this.outputDir}/${locale}.json`
- let output = JSON.stringify(data)
+ if (cacheEntry != null) {
+ const { filename, source, mtimeMs: cachedMtimeMs } = cacheEntry
- if (this.compress) {
- filename += '.br'
- output = await this.compressLocale(output)
+ if (cachedMtimeMs === mtimeMs) {
+ compilation.emitAsset(filename, source, { minimized: true })
+ resolve()
+ return
+ }
}
+ }
- let source = new RawSource(output)
+ this.removeEmptyValues(data)
- if (IS_DEV_SERVER) {
- source = new CachedSource(source)
- this.cache.push({ filename, source })
- }
+ let filename = `${this.outputDir}/${locale}.json`
+ let output = JSON.stringify(data)
- compilation.emitAsset(filename, source, { minimized: true })
+ if (this.compress) {
+ filename += '.br'
+ output = await this.compressLocale(output)
+ }
- resolve()
- }))
- }
+ let source = new RawSource(output)
- await Promise.all(promises)
+ if (IS_DEV_SERVER) {
+ source = new CachedSource(source)
+ this.cache[locale] = { filename, source, mtimeMs }
+ }
+
+ compilation.emitAsset(filename, source, { minimized: true })
+
+ resolve()
+ }))
if (IS_DEV_SERVER) {
// we don't need the unmodified sources anymore, as we use the cache `this.cache`
// so we can clear this to free some memory
- delete this.locales
+ delete localeEntry.data
}
- }
+ })
+
+ await Promise.all(promises)
})
})
}
- loadLocales() {
- const activeLocales = JSON.parse(readFileSync(`${this.inputDir}/activeLocales.json`))
+ loadLocales(loadModifiedFilesOnly = false) {
+ if (this.activeLocales.length === 0) {
+ this.activeLocales = JSON.parse(readFileSync(`${this.inputDir}/activeLocales.json`))
+ }
- for (const locale of activeLocales) {
- const contents = readFileSync(`${this.inputDir}/${locale}.yaml`, 'utf-8')
+ for (const locale of this.activeLocales) {
+ const filePath = `${this.inputDir}/${locale}.yaml`
+ // Cannot use `mtime` since values never equal
+ const mtimeMsFromStats = statSync(filePath).mtimeMs
+ if (loadModifiedFilesOnly) {
+ // Skip reading files where mtime (modified time) same as last read
+ // (stored in mtime)
+ const existingMtime = this.locales[locale]?.mtimeMs
+ if (existingMtime != null && existingMtime === mtimeMsFromStats) {
+ continue
+ }
+ }
+ const contents = readFileSync(filePath, 'utf-8')
const data = loadYaml(contents)
+ this.locales[locale] = { locale, data, mtimeMs: mtimeMsFromStats }
- this.localeNames.push(data['Locale Name'] ?? locale)
- this.locales.push({ locale, data })
+ const localeName = data['Locale Name'] ?? locale
+ if (!loadModifiedFilesOnly) {
+ this.localeNames.push(localeName)
+ }
}
}
diff --git a/_scripts/build.js b/_scripts/build.js
index 035f986c97dbe..bee33667fbeae 100644
--- a/_scripts/build.js
+++ b/_scripts/build.js
@@ -1,9 +1,9 @@
const os = require('os')
const builder = require('electron-builder')
+const config = require('./ebuilder.config.js')
const Platform = builder.Platform
const Arch = builder.Arch
-const { name, productName } = require('../package.json')
const args = process.argv
let targets
@@ -39,97 +39,6 @@ if (platform === 'darwin') {
targets = Platform.LINUX.createTarget(['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'], arch)
}
-const config = {
- appId: `io.freetubeapp.${name}`,
- copyright: 'Copyleft © 2020-2023 freetubeapp@protonmail.com',
- // asar: false,
- // compression: 'store',
- productName,
- directories: {
- output: './build/',
- },
- protocols: [
- {
- name: "FreeTube",
- schemes: [
- "freetube"
- ]
- }
- ],
- files: [
- '_icons/iconColor.*',
- 'icon.svg',
- './dist/**/*',
- '!dist/web/*',
- '!node_modules/**/*',
- ],
- dmg: {
- contents: [
- {
- path: '/Applications',
- type: 'link',
- x: 410,
- y: 230,
- },
- {
- type: 'file',
- x: 130,
- y: 230,
- },
- ],
- window: {
- height: 380,
- width: 540,
- }
- },
- linux: {
- category: 'Network',
- icon: '_icons/icon.svg',
- target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
- },
- // See the following issues for more information
- // https://github.com/jordansissel/fpm/issues/1503
- // https://github.com/jgraph/drawio-desktop/issues/259
- rpm: {
- fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
- },
- deb: {
- depends: [
- "libgtk-3-0",
- "libnotify4",
- "libnss3",
- "libxss1",
- "libxtst6",
- "xdg-utils",
- "libatspi2.0-0",
- "libuuid1",
- "libsecret-1-0"
- ]
- },
- mac: {
- category: 'public.app-category.utilities',
- icon: '_icons/iconMac.icns',
- target: ['dmg', 'zip', '7z'],
- type: 'distribution',
- extendInfo: {
- CFBundleURLTypes: [
- 'freetube'
- ],
- CFBundleURLSchemes: [
- 'freetube'
- ]
- }
- },
- win: {
- icon: '_icons/icon.ico',
- target: ['nsis', 'zip', '7z', 'portable'],
- },
- nsis: {
- allowToChangeInstallationDirectory: true,
- oneClick: false,
- },
-}
-
builder
.build({
targets,
diff --git a/_scripts/dev-runner.js b/_scripts/dev-runner.js
index d030c8b814035..fe25a836fff17 100644
--- a/_scripts/dev-runner.js
+++ b/_scripts/dev-runner.js
@@ -1,6 +1,5 @@
process.env.NODE_ENV = 'development'
-const open = require('open')
const electron = require('electron')
const webpack = require('webpack')
const WebpackDevServer = require('webpack-dev-server')
@@ -112,13 +111,14 @@ function startRenderer(callback) {
const server = new WebpackDevServer({
static: {
- directory: path.join(process.cwd(), 'static'),
+ directory: path.resolve(__dirname, '..', 'static'),
watch: {
ignored: [
/(dashFiles|storyboards)\/*/,
'/**/.DS_Store',
]
- }
+ },
+ publicPath: '/static'
},
port
}, compiler)
@@ -161,7 +161,8 @@ function startWeb (callback) {
if (!web) {
startRenderer(startMain)
} else {
- startWeb(({ port }) => {
+ startWeb(async ({ port }) => {
+ const open = (await import('open')).default
open(`http://localhost:${port}`)
})
}
diff --git a/_scripts/ebuilder.config.js b/_scripts/ebuilder.config.js
new file mode 100644
index 0000000000000..5b79d96185685
--- /dev/null
+++ b/_scripts/ebuilder.config.js
@@ -0,0 +1,94 @@
+const { name, productName } = require('../package.json')
+
+const config = {
+ appId: `io.freetubeapp.${name}`,
+ copyright: 'Copyleft © 2020-2024 freetubeapp@protonmail.com',
+ // asar: false,
+ // compression: 'store',
+ productName,
+ directories: {
+ output: './build/',
+ },
+ protocols: [
+ {
+ name: "FreeTube",
+ schemes: [
+ "freetube"
+ ]
+ }
+ ],
+ files: [
+ '_icons/iconColor.*',
+ 'icon.svg',
+ './dist/**/*',
+ '!dist/web/*',
+ '!node_modules/**/*',
+ ],
+ dmg: {
+ contents: [
+ {
+ path: '/Applications',
+ type: 'link',
+ x: 410,
+ y: 230,
+ },
+ {
+ type: 'file',
+ x: 130,
+ y: 230,
+ },
+ ],
+ window: {
+ height: 380,
+ width: 540,
+ }
+ },
+ linux: {
+ category: 'Network',
+ icon: '_icons/icon.svg',
+ target: ['deb', 'zip', '7z', 'apk', 'rpm', 'AppImage', 'pacman'],
+ },
+ // See the following issues for more information
+ // https://github.com/jordansissel/fpm/issues/1503
+ // https://github.com/jgraph/drawio-desktop/issues/259
+ rpm: {
+ fpm: [`--rpm-rpmbuild-define=_build_id_links none`]
+ },
+ deb: {
+ depends: [
+ "libgtk-3-0",
+ "libnotify4",
+ "libnss3",
+ "libxss1",
+ "libxtst6",
+ "xdg-utils",
+ "libatspi2.0-0",
+ "libuuid1",
+ "libsecret-1-0"
+ ]
+ },
+ mac: {
+ category: 'public.app-category.utilities',
+ icon: '_icons/iconMac.icns',
+ target: ['dmg', 'zip', '7z'],
+ type: 'distribution',
+ extendInfo: {
+ CFBundleURLTypes: [
+ 'freetube'
+ ],
+ CFBundleURLSchemes: [
+ 'freetube'
+ ]
+ }
+ },
+ win: {
+ icon: '_icons/icon.ico',
+ target: ['nsis', 'zip', '7z', 'portable'],
+ },
+ nsis: {
+ allowToChangeInstallationDirectory: true,
+ oneClick: false,
+ },
+}
+
+module.exports = config
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index 0f3c706c6a973..0358f79196aec 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -56,7 +56,7 @@ if (!isDevMode) {
to: path.join(__dirname, '../dist/static'),
globOptions: {
dot: true,
- ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+ ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
},
},
]
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index eaf72b50dc36f..fcd9b0e580980 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -1,13 +1,18 @@
const path = require('path')
+const { readFileSync, readdirSync } = require('fs')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const VueLoaderPlugin = require('vue-loader/lib/plugin')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
+const WatchExternalFilesPlugin = require('webpack-watch-external-files-plugin')
+const CopyWebpackPlugin = require('copy-webpack-plugin')
const isDevMode = process.env.NODE_ENV === 'development'
+const { version: swiperVersion } = JSON.parse(readFileSync(path.join(__dirname, '../node_modules/swiper/package.json')))
+
const processLocalesPlugin = new ProcessLocalesPlugin({
compress: !isDevMode,
inputDir: path.join(__dirname, '../static/locales'),
@@ -106,34 +111,48 @@ const config = {
]
},
node: {
- __dirname: isDevMode,
- __filename: isDevMode
+ __dirname: false,
+ __filename: false
},
plugins: [
processLocalesPlugin,
new webpack.DefinePlugin({
'process.env.IS_ELECTRON': true,
'process.env.IS_ELECTRON_MAIN': false,
- 'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames)
+ 'process.env.SUPPORTS_LOCAL_API': true,
+ 'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames),
+ 'process.env.GEOLOCATION_NAMES': JSON.stringify(readdirSync(path.join(__dirname, '..', 'static', 'geolocations')).map(filename => filename.replace('.json', ''))),
+ 'process.env.SWIPER_VERSION': `'${swiperVersion}'`
}),
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
- template: path.resolve(__dirname, '../src/index.ejs'),
- nodeModules: isDevMode
- ? path.resolve(__dirname, '../node_modules')
- : false,
+ template: path.resolve(__dirname, '../src/index.ejs')
}),
new VueLoaderPlugin(),
new MiniCssExtractPlugin({
filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
+ }),
+ new CopyWebpackPlugin({
+ patterns: [
+ {
+ from: path.join(__dirname, '../node_modules/swiper/modules/{a11y,navigation,pagination}-element.css').replaceAll('\\', '/'),
+ to: `swiper-${swiperVersion}.css`,
+ context: path.join(__dirname, '../node_modules/swiper/modules'),
+ transformAll: (assets) => {
+ return Buffer.concat(assets.map(asset => asset.data))
+ }
+ }
+ ]
})
],
resolve: {
alias: {
vue$: 'vue/dist/vue.runtime.esm.js',
+ 'DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$': path.resolve(__dirname, '../src/datastores/handlers/electron.js'),
+
'youtubei.js$': 'youtubei.js/web',
// video.js's mpd-parser uses @xmldom/xmldom so that it can support both node and web browsers
@@ -146,4 +165,16 @@ const config = {
target: 'electron-renderer',
}
+if (isDevMode) {
+ const activeLocales = JSON.parse(readFileSync(path.join(__dirname, '../static/locales/activeLocales.json')))
+
+ config.plugins.push(
+ new WatchExternalFilesPlugin({
+ files: [
+ `./static/locales/{${activeLocales.join(',')}}.yaml`,
+ ],
+ }),
+ )
+}
+
module.exports = config
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 420d350482ea4..04f4b9803d35b 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -11,6 +11,8 @@ const ProcessLocalesPlugin = require('./ProcessLocalesPlugin')
const isDevMode = process.env.NODE_ENV === 'development'
+const { version: swiperVersion } = JSON.parse(fs.readFileSync(path.join(__dirname, '../node_modules/swiper/package.json')))
+
const config = {
name: 'web',
mode: process.env.NODE_ENV,
@@ -23,7 +25,6 @@ const config = {
filename: '[name].js',
},
externals: {
- electron: '{}',
'youtubei.js': '{}'
},
module: {
@@ -107,13 +108,15 @@ const config = {
]
},
node: {
- __dirname: true,
- __filename: isDevMode,
+ __dirname: false,
+ __filename: false
},
plugins: [
new webpack.DefinePlugin({
'process.env.IS_ELECTRON': false,
'process.env.IS_ELECTRON_MAIN': false,
+ 'process.env.SUPPORTS_LOCAL_API': false,
+ 'process.env.SWIPER_VERSION': `'${swiperVersion}'`,
// video.js' vhs-utils supports both atob() in web browsers and Buffer in node
// As the FreeTube web build only runs in web browsers, we can override their check for atob() here: https://github.com/videojs/vhs-utils/blob/main/src/decode-b64-to-uint8-array.js#L3
@@ -133,19 +136,32 @@ const config = {
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
- template: path.resolve(__dirname, '../src/index.ejs'),
- nodeModules: false,
+ template: path.resolve(__dirname, '../src/index.ejs')
}),
new VueLoaderPlugin(),
new MiniCssExtractPlugin({
filename: isDevMode ? '[name].css' : '[name].[contenthash].css',
chunkFilename: isDevMode ? '[id].css' : '[id].[contenthash].css',
+ }),
+ new CopyWebpackPlugin({
+ patterns: [
+ {
+ from: path.join(__dirname, '../node_modules/swiper/modules/{a11y,navigation,pagination}-element.css').replaceAll('\\', '/'),
+ to: `swiper-${swiperVersion}.css`,
+ context: path.join(__dirname, '../node_modules/swiper/modules'),
+ transformAll: (assets) => {
+ return Buffer.concat(assets.map(asset => asset.data))
+ }
+ }
+ ]
})
],
resolve: {
alias: {
vue$: 'vue/dist/vue.runtime.esm.js',
+ 'DB_HANDLERS_ELECTRON_RENDERER_OR_WEB$': path.resolve(__dirname, '../src/datastores/handlers/web.js'),
+
// video.js's mpd-parser uses @xmldom/xmldom so that it can support both node and web browsers
// As FreeTube only runs in electron and web browsers, we can use the native DOMParser class, instead of the "polyfill"
// https://caniuse.com/mdn-api_domparser
diff --git a/jsconfig.json b/jsconfig.json
index 8f5ea8a228e3c..3dd46670d49e2 100644
--- a/jsconfig.json
+++ b/jsconfig.json
@@ -1,5 +1,15 @@
{
"vueCompilerOptions": {
"target": 2.7
+ },
+ "compilerOptions": {
+ "strictNullChecks": true,
+ "baseUrl": "./",
+ "paths": {
+ "DB_HANDLERS_ELECTRON_RENDERER_OR_WEB": [
+ "src/datastores/handlers/electron",
+ "src/datastores/handlers/web"
+ ]
+ }
}
}
diff --git a/lefthook.yml b/lefthook.yml
index 6a09c9530afc2..5ae04fe0ec520 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -3,13 +3,18 @@
pre-commit:
parallel: true
commands:
- lint:
+ eslint:
# Only runs when any file with filename
# matching the glob is being committed
glob: "*.{js,vue}"
run: yarn run eslint --no-color {staged_files}
skip:
- rebase
+ stylelint:
+ glob: "*.{css,scss}"
+ run: yarn stylelint --no-color --allow-empty-input {staged_files}
+ skip:
+ - rebase
# EXAMPLE USAGE
#
diff --git a/package.json b/package.json
index 83d767efe12c1..a9ae18cc225a1 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "freetube",
"productName": "FreeTube",
"description": "A private YouTube client",
- "version": "0.19.0",
+ "version": "0.20.0",
"license": "AGPL-3.0-or-later",
"main": "./dist/main.js",
"private": true,
@@ -25,7 +25,7 @@
"build-release": "node _scripts/build.js",
"build-release:arm64": "node _scripts/build.js arm64",
"build-release:arm32": "node _scripts/build.js arm32",
- "clean": "rimraf build/ static/dashFiles/ dist/ static/storyboards/",
+ "clean": "rimraf build/ dist/",
"debug": "run-s rebuild:electron debug-runner",
"debug-runner": "node _scripts/dev-runner.js --remote-debug",
"dev": "run-s rebuild:electron dev-runner",
@@ -33,15 +33,14 @@
"dev-runner": "node _scripts/dev-runner.js",
"get-instances": "node _scripts/getInstances.js",
"get-regions": "node _scripts/getRegions.mjs",
- "lint-all": "run-p lint lint-json lint-style",
- "lint-fix": "eslint --fix --ext .js,.vue ./",
- "lint": "eslint --ext .js,.vue ./",
+ "lint-all": "run-p lint lint-json",
+ "lint": "run-p eslint-lint lint-style",
+ "lint-fix": "run-p eslint-lint-fix lint-style-fix",
+ "eslint-lint": "eslint --ext .js,.vue ./",
+ "eslint-lint-fix": "eslint --fix --ext .js,.vue ./",
"lint-json": "eslint --ext .json ./",
- "lint-style": "run-p lint-style:scss lint-style:css",
- "lint-style:scss": "stylelint \"**/*.scss\"",
- "lint-style:css": "stylelint \"**/*.css\"",
- "lint-style-fix:scss": "stylelint --fix \"**/*.scss\"",
- "lint-style-fix:css": "stylelint --fix \"**/*.css\"",
+ "lint-style": "stylelint \"**/*.{css,scss}\"",
+ "lint-style-fix": "stylelint --fix \"**/*.{css,scss}\"",
"lint-yml": "eslint --ext .yml,.yaml ./",
"pack": "run-p pack:main pack:renderer",
"pack:main": "webpack --mode=production --node-env=production --config _scripts/webpack.main.config.js",
@@ -54,79 +53,82 @@
"ci": "yarn install --silent --frozen-lockfile"
},
"dependencies": {
- "@fortawesome/fontawesome-svg-core": "^6.4.2",
- "@fortawesome/free-brands-svg-icons": "^6.4.2",
- "@fortawesome/free-solid-svg-icons": "^6.4.2",
+ "@fortawesome/fontawesome-svg-core": "^6.5.2",
+ "@fortawesome/free-brands-svg-icons": "^6.5.2",
+ "@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/vue-fontawesome": "^2.0.10",
- "@seald-io/nedb": "^4.0.2",
- "@silvermine/videojs-quality-selector": "^1.3.0",
+ "@seald-io/nedb": "^4.0.4",
+ "@silvermine/videojs-quality-selector": "^1.3.1",
"autolinker": "^4.0.0",
"electron-context-menu": "^3.6.1",
"lodash.debounce": "^4.0.8",
- "marked": "^7.0.4",
+ "marked": "^12.0.1",
"path-browserify": "^1.0.1",
"process": "^0.11.10",
+ "swiper": "^11.1.1",
"video.js": "7.21.5",
"videojs-contrib-quality-levels": "^3.0.0",
"videojs-http-source-selector": "^1.1.6",
"videojs-mobile-ui": "^0.8.0",
"videojs-overlay": "^3.1.0",
"videojs-vtt-thumbnails-freetube": "0.0.15",
- "vue": "^2.7.14",
+ "vue": "^2.7.16",
"vue-i18n": "^8.28.2",
"vue-observe-visibility": "^1.0.0",
"vue-router": "^3.6.5",
- "vue-tiny-slider": "^0.1.39",
"vuex": "^3.6.2",
- "youtubei.js": "^6.0.0"
+ "youtubei.js": "^9.3.0"
},
"devDependencies": {
- "@babel/core": "^7.22.10",
- "@babel/eslint-parser": "^7.22.10",
+ "@babel/core": "^7.24.4",
+ "@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
- "@babel/preset-env": "^7.22.10",
- "@double-great/stylelint-a11y": "^2.0.2",
+ "@babel/preset-env": "^7.24.4",
+ "@double-great/stylelint-a11y": "^3.0.2",
+ "@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"babel-loader": "^9.1.3",
- "copy-webpack-plugin": "^11.0.0",
- "css-loader": "^6.8.1",
- "css-minimizer-webpack-plugin": "^5.0.1",
- "electron": "^22.3.18",
- "electron-builder": "^24.6.3",
- "eslint": "^8.47.0",
- "eslint-config-prettier": "^9.0.0",
+ "copy-webpack-plugin": "^12.0.2",
+ "css-loader": "^7.1.1",
+ "css-minimizer-webpack-plugin": "^6.0.0",
+ "electron": "^29.3.0",
+ "electron-builder": "^24.13.3",
+ "eslint": "^8.57.0",
+ "eslint-config-prettier": "^9.1.0",
"eslint-config-standard": "^17.1.0",
- "eslint-plugin-import": "^2.28.1",
- "eslint-plugin-jsonc": "^2.9.0",
- "eslint-plugin-n": "^16.0.1",
- "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-import": "^2.29.1",
+ "eslint-plugin-jsonc": "^2.15.1",
+ "eslint-plugin-n": "^17.2.1",
+ "eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
- "eslint-plugin-unicorn": "^48.0.1",
- "eslint-plugin-vue": "^9.17.0",
- "eslint-plugin-vuejs-accessibility": "^2.2.0",
- "eslint-plugin-yml": "^1.8.0",
- "html-webpack-plugin": "^5.5.3",
+ "eslint-plugin-unicorn": "^52.0.0",
+ "eslint-plugin-vue": "^9.25.0",
+ "eslint-plugin-vuejs-accessibility": "^2.2.1",
+ "eslint-plugin-yml": "^1.14.0",
+ "html-webpack-plugin": "^5.6.0",
"js-yaml": "^4.1.0",
- "json-minimizer-webpack-plugin": "^4.0.0",
- "lefthook": "^1.4.9",
- "mini-css-extract-plugin": "^2.7.6",
+ "json-minimizer-webpack-plugin": "^5.0.0",
+ "lefthook": "^1.6.10",
+ "mini-css-extract-plugin": "^2.8.1",
"npm-run-all": "^4.1.5",
- "postcss": "^8.4.26",
- "postcss-scss": "^4.0.7",
+ "postcss": "^8.4.38",
+ "postcss-scss": "^4.0.9",
"prettier": "^2.8.8",
- "rimraf": "^5.0.1",
- "sass": "^1.66.1",
- "sass-loader": "^13.3.2",
- "stylelint": "^15.10.3",
- "stylelint-config-sass-guidelines": "^10.0.0",
- "stylelint-config-standard": "^34.0.0",
- "stylelint-high-performance-animation": "^1.9.0",
+ "rimraf": "^5.0.5",
+ "sass": "^1.75.0",
+ "sass-loader": "^14.2.0",
+ "stylelint": "^16.3.1",
+ "stylelint-config-sass-guidelines": "^11.1.0",
+ "stylelint-config-standard": "^36.0.0",
+ "stylelint-high-performance-animation": "^1.10.0",
+ "stylelint-use-logical-spec": "^5.0.1",
"tree-kill": "1.2.2",
"vue-devtools": "^5.1.4",
- "vue-eslint-parser": "^9.3.1",
+ "vue-eslint-parser": "^9.4.2",
"vue-loader": "^15.10.0",
- "webpack": "^5.88.2",
+ "webpack": "^5.91.0",
"webpack-cli": "^5.1.4",
- "webpack-dev-server": "^4.15.1",
+ "webpack-dev-server": "^5.0.4",
+ "webpack-watch-external-files-plugin": "^3.0.0",
"yaml-eslint-parser": "^1.2.2"
}
}
diff --git a/src/constants.js b/src/constants.js
index 4693d857623fd..3224725035b5b 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -23,7 +23,10 @@ const IpcChannels = {
SYNC_SETTINGS: 'sync-settings',
SYNC_HISTORY: 'sync-history',
SYNC_PROFILES: 'sync-profiles',
- SYNC_PLAYLISTS: 'sync-playlists'
+ SYNC_PLAYLISTS: 'sync-playlists',
+
+ GET_REPLACE_HTTP_CACHE: 'get-replace-http-cache',
+ TOGGLE_REPLACE_HTTP_CACHE: 'toggle-replace-http-cache'
}
const DBActions = {
@@ -44,10 +47,10 @@ const DBActions = {
PLAYLISTS: {
UPSERT_VIDEO: 'db-action-playlists-upsert-video-by-playlist-name',
- UPSERT_VIDEO_IDS: 'db-action-playlists-upsert-video-ids-by-playlist-id',
+ UPSERT_VIDEOS: 'db-action-playlists-upsert-videos-by-playlist-name',
DELETE_VIDEO_ID: 'db-action-playlists-delete-video-by-playlist-name',
DELETE_VIDEO_IDS: 'db-action-playlists-delete-video-ids',
- DELETE_ALL_VIDEOS: 'db-action-playlists-delete-all-videos'
+ DELETE_ALL_VIDEOS: 'db-action-playlists-delete-all-videos',
}
}
@@ -66,15 +69,10 @@ const SyncEvents = {
PLAYLISTS: {
UPSERT_VIDEO: 'sync-playlists-upsert-video',
- DELETE_VIDEO: 'sync-playlists-delete-video'
+ DELETE_VIDEO: 'sync-playlists-delete-video',
}
}
-// https://v2.vuejs.org/v2/api/#provide-inject
-const Injectables = {
- SHOW_OUTLINES: 'showOutlines'
-}
-
// Utils
const MAIN_PROFILE_ID = 'allChannels'
@@ -82,6 +80,5 @@ export {
IpcChannels,
DBActions,
SyncEvents,
- Injectables,
MAIN_PROFILE_ID
}
diff --git a/src/datastores/handlers/base.js b/src/datastores/handlers/base.js
index 71e1ca3889682..7c2eb4ec0539d 100644
--- a/src/datastores/handlers/base.js
+++ b/src/datastores/handlers/base.js
@@ -1,4 +1,4 @@
-import db from '../index'
+import * as db from '../index'
class Settings {
static find() {
@@ -64,8 +64,8 @@ class History {
return db.history.updateAsync({ videoId }, { $set: { watchProgress } }, { upsert: true })
}
- static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
- return db.history.updateAsync({ videoId }, { $set: { lastViewedPlaylistId } }, { upsert: true })
+ static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
+ return db.history.updateAsync({ videoId }, { $set: { lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId } }, { upsert: true })
}
static delete(videoId) {
@@ -112,18 +112,22 @@ class Playlists {
return db.playlists.findAsync({})
}
- static upsertVideoByPlaylistName(playlistName, videoData) {
+ static upsert(playlist) {
+ return db.playlists.updateAsync({ _id: playlist._id }, { $set: playlist }, { upsert: true })
+ }
+
+ static upsertVideoByPlaylistId(_id, videoData) {
return db.playlists.updateAsync(
- { playlistName },
+ { _id },
{ $push: { videos: videoData } },
{ upsert: true }
)
}
- static upsertVideoIdsByPlaylistId(_id, videoIds) {
+ static upsertVideosByPlaylistId(_id, videos) {
return db.playlists.updateAsync(
{ _id },
- { $push: { videos: { $each: videoIds } } },
+ { $push: { videos: { $each: videos } } },
{ upsert: true }
)
}
@@ -132,25 +136,35 @@ class Playlists {
return db.playlists.removeAsync({ _id, protected: { $ne: true } })
}
- static deleteVideoIdByPlaylistName(playlistName, videoId) {
- return db.playlists.updateAsync(
- { playlistName },
- { $pull: { videos: { videoId } } },
- { upsert: true }
- )
+ static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
+ if (playlistItemId != null) {
+ return db.playlists.updateAsync(
+ { _id },
+ { $pull: { videos: { playlistItemId } } },
+ { upsert: true }
+ )
+ } else if (videoId != null) {
+ return db.playlists.updateAsync(
+ { _id },
+ { $pull: { videos: { videoId } } },
+ { upsert: true }
+ )
+ } else {
+ throw new Error(`Both videoId & playlistItemId are absent, _id: ${_id}`)
+ }
}
- static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
+ static deleteVideoIdsByPlaylistId(_id, videoIds) {
return db.playlists.updateAsync(
- { playlistName },
- { $pull: { videos: { $in: videoIds } } },
+ { _id },
+ { $pull: { videos: { videoId: { $in: videoIds } } } },
{ upsert: true }
)
}
- static deleteAllVideosByPlaylistName(playlistName) {
+ static deleteAllVideosByPlaylistId(_id) {
return db.playlists.updateAsync(
- { playlistName },
+ { _id },
{ $set: { videos: [] } },
{ upsert: true }
)
@@ -161,7 +175,7 @@ class Playlists {
}
static deleteAll() {
- return db.playlists.removeAsync({ protected: { $ne: true } })
+ return db.playlists.removeAsync({}, { multi: true })
}
static persist() {
@@ -174,17 +188,15 @@ function compactAllDatastores() {
Settings.persist(),
History.persist(),
Profiles.persist(),
- Playlists.persist()
+ Playlists.persist(),
])
}
-const baseHandlers = {
- settings: Settings,
- history: History,
- profiles: Profiles,
- playlists: Playlists,
+export {
+ Settings as settings,
+ History as history,
+ Profiles as profiles,
+ Playlists as playlists,
- compactAllDatastores
+ compactAllDatastores,
}
-
-export default baseHandlers
diff --git a/src/datastores/handlers/electron.js b/src/datastores/handlers/electron.js
index ddb90ff82434e..31e8c96305ece 100644
--- a/src/datastores/handlers/electron.js
+++ b/src/datastores/handlers/electron.js
@@ -42,12 +42,12 @@ class History {
)
}
- static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
+ static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
return ipcRenderer.invoke(
IpcChannels.DB_HISTORY,
{
action: DBActions.HISTORY.UPDATE_PLAYLIST,
- data: { videoId, lastViewedPlaylistId }
+ data: { videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId }
}
)
}
@@ -126,22 +126,29 @@ class Playlists {
)
}
- static upsertVideoByPlaylistName(playlistName, videoData) {
+ static upsert(playlist) {
+ return ipcRenderer.invoke(
+ IpcChannels.DB_PLAYLISTS,
+ { action: DBActions.GENERAL.UPSERT, data: playlist }
+ )
+ }
+
+ static upsertVideoByPlaylistId(_id, videoData) {
return ipcRenderer.invoke(
IpcChannels.DB_PLAYLISTS,
{
action: DBActions.PLAYLISTS.UPSERT_VIDEO,
- data: { playlistName, videoData }
+ data: { _id, videoData }
}
)
}
- static upsertVideoIdsByPlaylistId(_id, videoIds) {
+ static upsertVideosByPlaylistId(_id, videos) {
return ipcRenderer.invoke(
IpcChannels.DB_PLAYLISTS,
{
- action: DBActions.PLAYLISTS.UPSERT_VIDEO_IDS,
- data: { _id, videoIds }
+ action: DBActions.PLAYLISTS.UPSERT_VIDEOS,
+ data: { _id, videos }
}
)
}
@@ -153,32 +160,32 @@ class Playlists {
)
}
- static deleteVideoIdByPlaylistName(playlistName, videoId) {
+ static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
return ipcRenderer.invoke(
IpcChannels.DB_PLAYLISTS,
{
action: DBActions.PLAYLISTS.DELETE_VIDEO_ID,
- data: { playlistName, videoId }
+ data: { _id, videoId, playlistItemId }
}
)
}
- static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
+ static deleteVideoIdsByPlaylistId(_id, videoIds) {
return ipcRenderer.invoke(
IpcChannels.DB_PLAYLISTS,
{
action: DBActions.PLAYLISTS.DELETE_VIDEO_IDS,
- data: { playlistName, videoIds }
+ data: { _id, videoIds }
}
)
}
- static deleteAllVideosByPlaylistName(playlistName) {
+ static deleteAllVideosByPlaylistId(_id) {
return ipcRenderer.invoke(
IpcChannels.DB_PLAYLISTS,
{
action: DBActions.PLAYLISTS.DELETE_ALL_VIDEOS,
- data: playlistName
+ data: _id
}
)
}
@@ -198,11 +205,9 @@ class Playlists {
}
}
-const handlers = {
- settings: Settings,
- history: History,
- profiles: Profiles,
- playlists: Playlists
+export {
+ Settings as settings,
+ History as history,
+ Profiles as profiles,
+ Playlists as playlists
}
-
-export default handlers
diff --git a/src/datastores/handlers/index.js b/src/datastores/handlers/index.js
index e96565d1fba76..df6ebffd9d808 100644
--- a/src/datastores/handlers/index.js
+++ b/src/datastores/handlers/index.js
@@ -1,18 +1,6 @@
-let handlers
-if (process.env.IS_ELECTRON) {
- handlers = require('./electron').default
-} else {
- handlers = require('./web').default
-}
-
-const DBSettingHandlers = handlers.settings
-const DBHistoryHandlers = handlers.history
-const DBProfileHandlers = handlers.profiles
-const DBPlaylistHandlers = handlers.playlists
-
export {
- DBSettingHandlers,
- DBHistoryHandlers,
- DBProfileHandlers,
- DBPlaylistHandlers
-}
+ settings as DBSettingHandlers,
+ history as DBHistoryHandlers,
+ profiles as DBProfileHandlers,
+ playlists as DBPlaylistHandlers
+} from 'DB_HANDLERS_ELECTRON_RENDERER_OR_WEB'
diff --git a/src/datastores/handlers/web.js b/src/datastores/handlers/web.js
index a81eb305d1dd9..d5feccc998d07 100644
--- a/src/datastores/handlers/web.js
+++ b/src/datastores/handlers/web.js
@@ -1,4 +1,4 @@
-import baseHandlers from './base'
+import * as baseHandlers from './base'
// TODO: Syncing
// Syncing on the web would involve a different implementation
@@ -33,8 +33,8 @@ class History {
return baseHandlers.history.updateWatchProgress(videoId, watchProgress)
}
- static updateLastViewedPlaylist(videoId, lastViewedPlaylistId) {
- return baseHandlers.history.updateLastViewedPlaylist(videoId, lastViewedPlaylistId)
+ static updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId) {
+ return baseHandlers.history.updateLastViewedPlaylist(videoId, lastViewedPlaylistId, lastViewedPlaylistType, lastViewedPlaylistItemId)
}
static delete(videoId) {
@@ -81,28 +81,32 @@ class Playlists {
return baseHandlers.playlists.find()
}
- static upsertVideoByPlaylistName(playlistName, videoData) {
- return baseHandlers.playlists.upsertVideoByPlaylistName(playlistName, videoData)
+ static upsert(playlist) {
+ return baseHandlers.playlists.upsert(playlist)
}
- static upsertVideoIdsByPlaylistId(_id, videoIds) {
- return baseHandlers.playlists.upsertVideoIdsByPlaylistId(_id, videoIds)
+ static upsertVideoByPlaylistId(_id, videoData) {
+ return baseHandlers.playlists.upsertVideoByPlaylistId(_id, videoData)
+ }
+
+ static upsertVideosByPlaylistId(_id, videoData) {
+ return baseHandlers.playlists.upsertVideosByPlaylistId(_id, videoData)
}
static delete(_id) {
return baseHandlers.playlists.delete(_id)
}
- static deleteVideoIdByPlaylistName(playlistName, videoId) {
- return baseHandlers.playlists.deleteVideoIdByPlaylistName(playlistName, videoId)
+ static deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId }) {
+ return baseHandlers.playlists.deleteVideoIdByPlaylistId({ _id, videoId, playlistItemId })
}
- static deleteVideoIdsByPlaylistName(playlistName, videoIds) {
- return baseHandlers.playlists.deleteVideoIdsByPlaylistName(playlistName, videoIds)
+ static deleteVideoIdsByPlaylistId(_id, videoIds) {
+ return baseHandlers.playlists.deleteVideoIdsByPlaylistId(_id, videoIds)
}
- static deleteAllVideosByPlaylistName(playlistName) {
- return baseHandlers.playlists.deleteAllVideosByPlaylistName(playlistName)
+ static deleteAllVideosByPlaylistId(_id) {
+ return baseHandlers.playlists.deleteAllVideosByPlaylistId(_id)
}
static deleteMultiple(ids) {
@@ -114,11 +118,9 @@ class Playlists {
}
}
-const handlers = {
- settings: Settings,
- history: History,
- profiles: Profiles,
- playlists: Playlists
+export {
+ Settings as settings,
+ History as history,
+ Profiles as profiles,
+ Playlists as playlists
}
-
-export default handlers
diff --git a/src/datastores/index.js b/src/datastores/index.js
index a7038fec96651..442fed6497bfb 100644
--- a/src/datastores/index.js
+++ b/src/datastores/index.js
@@ -22,10 +22,7 @@ if (process.env.IS_ELECTRON_MAIN) {
dbPath = (dbName) => `${dbName}.db`
}
-const db = {}
-db.settings = new Datastore({ filename: dbPath('settings'), autoload: true })
-db.profiles = new Datastore({ filename: dbPath('profiles'), autoload: true })
-db.playlists = new Datastore({ filename: dbPath('playlists'), autoload: true })
-db.history = new Datastore({ filename: dbPath('history'), autoload: true })
-
-export default db
+export const settings = new Datastore({ filename: dbPath('settings'), autoload: true })
+export const profiles = new Datastore({ filename: dbPath('profiles'), autoload: true })
+export const playlists = new Datastore({ filename: dbPath('playlists'), autoload: true })
+export const history = new Datastore({ filename: dbPath('history'), autoload: true })
diff --git a/src/index.ejs b/src/index.ejs
index 1a224ca4a4a23..40f7075a171a6 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -9,13 +9,6 @@
<% } %>
| {{ formattedViews }} | +|
| + {{ $t('Global.Videos') }} + | +{{ formattedVideos }} | +
|---|---|