Mirror/SponsorBlock
1
0
Fork 0
mirror of https://github.com/ajayyy/SponsorBlock.git synced 2025-12-17 21:18:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2342 from mschae23/rules-parser

Browse Source 
Rewrite advanced skip options parser to add "or" operator
This commit is contained in:
Ajay Ramachandran
2025-10-20 03:21:44 -04:00
committed by GitHub
parent 590281f8eb f80ddc8841
commit bd0be90135
3 changed files with 888 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/config.ts
View File

@@ -1,9 +1,9 @@
import * as CompileConfig from "../config.json";
import * as invidiousList from "../ci/invidiouslist.json";
import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorTime, VideoID, SponsorHideType, SegmentListDefaultTab } from "./types";
import { Keybind, ProtoConfig, keybindEquals } from "../maze-utils/src/config";
import { Category, CategorySelection, CategorySkipOption, NoticeVisibilityMode, PreviewBarOption, SponsorHideType, SponsorTime, VideoID, SegmentListDefaultTab } from "./types";
import { Keybind, keybindEquals, ProtoConfig } from "../maze-utils/src/config";
import { HashedValue } from "../maze-utils/src/hash";
import { Permission, AdvancedSkipRuleSet } from "./utils/skipRule";
import { AdvancedSkipCheck, AdvancedSkipPredicate, AdvancedSkipRule, Permission, PredicateOperator } from "./utils/skipRule";
interface SBConfig {
userID: string;
@@ -157,7 +157,7 @@ interface SBStorage {
/* VideoID prefixes to UUID prefixes */
downvotedSegments: Record<VideoID & HashedValue, VideoDownvotes>;
navigationApiAvailable: boolean;
// Used when sync storage disabled
alreadyInstalled: boolean;
@@ -168,7 +168,7 @@ interface SBStorage {
skipProfileTemp: { time: number; configID: ConfigurationID } | null;
skipProfiles: Record<ConfigurationID, CustomConfiguration>;
skipRules: AdvancedSkipRuleSet[];
skipRules: AdvancedSkipRule[];
}
class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
@@ -188,6 +188,43 @@ class ConfigClass extends ProtoConfig<SBConfig, SBStorage> {
}
function migrateOldSyncFormats(config: SBConfig, local: SBStorage) {
if (local["skipRules"] && local["skipRules"].length !== 0 && local["skipRules"][0]["rules"]) {
const output: AdvancedSkipRule[] = [];
for (const rule of local["skipRules"]) {
const rules: object[] = rule["rules"];
if (rules.length !== 0) {
let predicate: AdvancedSkipPredicate = {
kind: "check",
...rules[0] as AdvancedSkipCheck,
};
for (let i = 1; i < rules.length; i++) {
predicate = {
kind: "operator",
operator: PredicateOperator.And,
left: predicate,
right: {
kind: "check",
...rules[i] as AdvancedSkipCheck,
},
};
}
const comment = rule["comment"] as string;
output.push({
predicate,
skipOption: rule.skipOption,
comments: comment.length === 0 ? [] : comment.split(/;\s*/),
});
}
}
local["skipRules"] = output;
}
if (config["whitelistedChannels"]) {
// convert to skipProfiles
const whitelistedChannels = config["whitelistedChannels"] as string[];
@@ -214,7 +251,7 @@ function migrateOldSyncFormats(config: SBConfig, local: SBStorage) {
for (const channelID of whitelistedChannels) {
local.channelSkipProfileIDs[channelID] = skipProfileID;
}
local.channelSkipProfileIDs = local.channelSkipProfileIDs;
local.channelSkipProfileIDs = local.channelSkipProfileIDs;
chrome.storage.sync.remove("whitelistedChannels");
}
@@ -248,7 +285,7 @@ function migrateOldSyncFormats(config: SBConfig, local: SBStorage) {
name: "chapter" as Category,
option: CategorySkipOption.ShowOverlay
});
config.categorySelections = config.categorySelections;
}
}