tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v0.13.1-hotfix'

This commit is contained in:
Preston 2021-05-29 17:52:23 -04:00
parent 87a8fd39a0 3a9c85cf9d
commit 5f54a26e8b
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_scripts/build.js
View File

@ -69,6 +69,12 @@ const config = {
icon: '_icons/icon.svg', icon: '_icons/icon.svg',
target: ['deb', 'zip', 'apk', 'rpm', 'AppImage', 'pacman'], target: ['deb', 'zip', '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: { deb: {
depends: [ depends: [
"libgtk-3-0", "libgtk-3-0",

26
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "freetube", "name": "freetube",
"version": "0.13.0", "version": "0.13.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -7548,9 +7548,9 @@
"dev": true "dev": true
}, },
"dns-packet": { "dns-packet": {
"version": "1.3.1", "version": "1.3.4",
"resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.4.tgz",
"integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", "integrity": "sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==",
"dev": true, "dev": true,
"requires": { "requires": {
"ip": "^1.1.0", "ip": "^1.1.0",
@ -19537,9 +19537,9 @@
} }
}, },
"ytdl-core": { "ytdl-core": {
"version": "4.8.0", "version": "4.8.2",
"resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.8.0.tgz", "resolved": "https://registry.npmjs.org/ytdl-core/-/ytdl-core-4.8.2.tgz",
"integrity": "sha512-LFhhwqFojReoaME17VpsFeiamygM0W/YNG8O02mrmS2O6Em5LjCPiJYdq7Af3CmJtBEOCdptSZ3Ql+3LGWDGvg==", "integrity": "sha512-O3n++YcgZawaXJwbPmnRDgfN6b4kU0DpNdkI9Na5yM3JAdfJmoq5UHc8v9Xjgjr1RilQUUh7mhDnRRPDtKr0Kg==",
"requires": { "requires": {
"m3u8stream": "^0.8.3", "m3u8stream": "^0.8.3",
"miniget": "^4.0.0", "miniget": "^4.0.0",
@ -19547,18 +19547,18 @@
}, },
"dependencies": { "dependencies": {
"m3u8stream": { "m3u8stream": {
"version": "0.8.3", "version": "0.8.4",
"resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.8.3.tgz", "resolved": "https://registry.npmjs.org/m3u8stream/-/m3u8stream-0.8.4.tgz",
"integrity": "sha512-0nAcdrF8YJKUkb6PzWdvGftTPyCVWgoiot1AkNVbPKTeIGsWs6DrOjifrJ0Zi8WQfQmD2SuVCjkYIOip12igng==", "integrity": "sha512-sco80Db+30RvcaIOndenX6E6oQNgTiBKeJbFPc+yDXwPQIkryfboEbCvXPlBRq3mQTCVPQO93TDVlfRwqpD35w==",
"requires": { "requires": {
"miniget": "^4.0.0", "miniget": "^4.0.0",
"sax": "^1.2.4" "sax": "^1.2.4"
} }
}, },
"miniget": { "miniget": {
"version": "4.2.0", "version": "4.2.1",
"resolved": "https://registry.npmjs.org/miniget/-/miniget-4.2.0.tgz", "resolved": "https://registry.npmjs.org/miniget/-/miniget-4.2.1.tgz",
"integrity": "sha512-IzTOaNgBw/qEpzkPTE7X2cUVXQfSKbG8w52Emi93zb+Zya2ZFrbmavpixzebuDJD9Ku4ecbaFlC7Y1cEESzQtQ==" "integrity": "sha512-O/DduzDR6f+oDtVype9S/Qu5hhnx73EDYGyZKwU/qN82lehFZdfhoa4DT51SpsO+8epYrB3gcRmws56ROfTIoQ=="
}, },
"sax": { "sax": {
"version": "1.2.4", "version": "1.2.4",

4
package.json
View File

@ -51,7 +51,7 @@
"yt-comment-scraper": "^4.0.3", "yt-comment-scraper": "^4.0.3",
"yt-dash-manifest-generator": "1.1.0", "yt-dash-manifest-generator": "1.1.0",
"yt-trending-scraper": "^2.0.0", "yt-trending-scraper": "^2.0.0",
"ytdl-core": "^4.8.0", "ytdl-core": "^4.8.2",
"ytpl": "^2.2.1", "ytpl": "^2.2.1",
"ytsr": "^3.5.0" "ytsr": "^3.5.0"
}, },
@ -147,5 +147,5 @@
"test": "run-s rebuild:node pack:workers jest", "test": "run-s rebuild:node pack:workers jest",
"test:watch": "run-s rebuild:node pack:workers jest:watch" "test:watch": "run-s rebuild:node pack:workers jest:watch"
}, },
"version": "0.13.0" "version": "0.13.1"
} }

6
src/renderer/store/modules/ytdl.js
View File

@ -200,9 +200,9 @@ const actions = {
if (searchSettings.duration !== '') { if (searchSettings.duration !== '') {
let filterValue = null let filterValue = null
if (searchSettings.duration === 'short') { if (searchSettings.duration === 'short') {
filterValue = 'Short (< 4 minutes)' filterValue = 'Under 4 minutes'
} else if (searchSettings.duration === 'long') { } else if (searchSettings.duration === 'long') {
filterValue = 'Long (> 20 minutes)' filterValue = 'Over 20 minutes'
} }
filterUrl = filter.get('Duration').get(filterValue).url filterUrl = filter.get('Duration').get(filterValue).url
@ -216,7 +216,7 @@ const actions = {
switch (searchSettings.time) { switch (searchSettings.time) {
case 'hour': case 'hour':
filterValue = 'Last Hour' filterValue = 'Last hour'
break break
case 'today': case 'today':
filterValue = 'Today' filterValue = 'Today'