Skip to content

Commit dcf863b

Browse files
committed
Merge branch 'development' into sabr-pr
* development: (41 commits) Translated using Weblate (Turkish) ! Fix top nav cannot search in new window (#8254) Bump vue from 3.5.22 to 3.5.24 (#8257) Translated using Weblate (Czech) Translated using Weblate (Italian) Translated using Weblate (Polish) Translated using Weblate (Hungarian) Translated using Weblate (Norwegian Bokmål) Bump lefthook from 2.0.2 to 2.0.3 (#8258) Bump the eslint group with 2 updates (#8256) Bump marked from 16.4.1 to 17.0.0 (#8260) Translated using Weblate (Breton) Translated using Weblate (Estonian) Translated using Weblate (French) Translated using Weblate (Chinese (Simplified Han script)) Add support for importing and exporting search history (#8237) Invidious API: Fix published dates on recommended videos (#8251) Translated using Weblate (Chinese (Simplified Han script)) ! Fix playlist progress bar preview broken in IV API (#8245) Wrap interactive FontAwesomeIcons in actual buttons (#8206) ... # Conflicts: # package.json
2 parents 3d66e47 + cf4f48b commit dcf863b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+1120
-753
lines changed
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading
Lines changed: 1 addition & 0 deletions
Loading

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@
6464
"bgutils-js": "^3.2.0",
6565
"electron-context-menu": "^4.1.1",
6666
"googlevideo": "^4.0.4",
67-
"marked": "^16.4.1",
67+
"marked": "^17.0.0",
6868
"process": "^0.11.10",
6969
"shaka-player": "^4.16.8",
7070
"swiper": "^12.0.3",
71-
"vue": "^3.5.22",
71+
"vue": "^3.5.24",
7272
"vue-i18n": "^11.1.12",
7373
"vue-observe-visibility": "^2.0.0-alpha.1",
7474
"vue-router": "^4.6.3",
@@ -79,15 +79,15 @@
7979
"@babel/core": "^7.28.5",
8080
"@babel/preset-env": "^7.28.5",
8181
"@double-great/stylelint-a11y": "^3.4.0",
82-
"@eslint/js": "^9.39.0",
82+
"@eslint/js": "^9.39.1",
8383
"@intlify/eslint-plugin-vue-i18n": "^4.1.0",
8484
"babel-loader": "^10.0.0",
8585
"copy-webpack-plugin": "^13.0.1",
8686
"css-loader": "^7.1.2",
8787
"css-minimizer-webpack-plugin": "^7.0.2",
8888
"electron": "^38.4.0",
8989
"electron-builder": "^26.1.0",
90-
"eslint": "^9.39.0",
90+
"eslint": "^9.39.1",
9191
"eslint-plugin-jsdoc": "^61.1.12",
9292
"eslint-plugin-jsonc": "^2.21.0",
9393
"eslint-plugin-unicorn": "^62.0.0",
@@ -98,7 +98,7 @@
9898
"html-webpack-plugin": "^5.6.4",
9999
"js-yaml": "^4.1.0",
100100
"json-minimizer-webpack-plugin": "^5.0.1",
101-
"lefthook": "^2.0.2",
101+
"lefthook": "^2.0.3",
102102
"mini-css-extract-plugin": "^2.9.4",
103103
"neostandard": "^0.12.2",
104104
"npm-run-all2": "^8.0.4",

src/constants.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ const DBActions = {
5757
UPSERT: 2,
5858
DELETE: 3,
5959
DELETE_MULTIPLE: 4,
60-
DELETE_ALL: 5
60+
DELETE_ALL: 5,
61+
OVERWRITE: 6
6162
},
6263

6364
HISTORY: {
64-
OVERWRITE: 20,
65-
UPDATE_WATCH_PROGRESS: 21,
66-
UPDATE_PLAYLIST: 22,
65+
UPDATE_WATCH_PROGRESS: 20,
66+
UPDATE_PLAYLIST: 21,
6767
},
6868

6969
PROFILES: {
@@ -97,13 +97,13 @@ const SyncEvents = {
9797
UPSERT: 1,
9898
DELETE: 2,
9999
DELETE_MULTIPLE: 3,
100-
DELETE_ALL: 4
100+
DELETE_ALL: 4,
101+
OVERWRITE: 5,
101102
},
102103

103104
HISTORY: {
104-
OVERWRITE: 20,
105-
UPDATE_WATCH_PROGRESS: 21,
106-
UPDATE_PLAYLIST: 22,
105+
UPDATE_WATCH_PROGRESS: 20,
106+
UPDATE_PLAYLIST: 21,
107107
},
108108

109109
PROFILES: {

src/datastores/handlers/base.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,12 @@ class SearchHistory {
272272
return db.searchHistory.updateAsync({ _id: searchHistoryEntry._id }, searchHistoryEntry, { upsert: true })
273273
}
274274

275+
static async overwrite(records) {
276+
await db.searchHistory.removeAsync({}, { multi: true })
277+
278+
await db.searchHistory.insertAsync(records)
279+
}
280+
275281
static delete(_id) {
276282
return db.searchHistory.removeAsync({ _id: _id })
277283
}

src/datastores/handlers/electron.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class History {
2020
}
2121

2222
static overwrite(records) {
23-
return window.ftElectron.dbHistory(DBActions.HISTORY.OVERWRITE, records)
23+
return window.ftElectron.dbHistory(DBActions.GENERAL.OVERWRITE, records)
2424
}
2525

2626
static updateWatchProgress(videoId, watchProgress) {
@@ -139,6 +139,10 @@ class SearchHistory {
139139
return window.ftElectron.dbSearchHistory(DBActions.GENERAL.UPSERT, searchHistoryEntry)
140140
}
141141

142+
static overwrite(records) {
143+
return window.ftElectron.dbSearchHistory(DBActions.GENERAL.OVERWRITE, records)
144+
}
145+
142146
static delete(_id) {
143147
return window.ftElectron.dbSearchHistory(DBActions.GENERAL.DELETE, _id)
144148
}

0 commit comments

Comments
 (0)