Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Improved Skip Patterns #167

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP: Improved Skip Patterns #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions src/ObsidianLiveSyncSettingTab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Logger } from "./lib/src/logger";
import { checkSyncInfo, isCloudantURI } from "./lib/src/utils_couchdb.js";
import { testCrypt } from "./lib/src/e2ee_v2";
import ObsidianLiveSyncPlugin from "./main";
import { createPatternSetSetting, Pattern, PatternSetSetting } from "./PatternSet";

const requestToCouchDB = async (baseUri: string, username: string, password: string, origin: string, key?: string, body?: string) => {
const utf8str = String.fromCharCode.apply(null, new TextEncoder().encode(`${username}:${password}`));
Expand Down Expand Up @@ -1098,41 +1099,34 @@ export class ObsidianLiveSyncSettingTab extends PluginSettingTab {
});
text.inputEl.setAttribute("type", "number");
});
let skipPatternTextArea: TextAreaComponent = null;
const defaultSkipPattern = "\\/node_modules\\/, \\/\\.git\\/, \\/obsidian-livesync\\/";
const defaultSkipPatternXPlat = defaultSkipPattern + ",\\/workspace$ ,\\/workspace.json$";

const defaultSkipPattern = [{regex: "\\/node_modules\\/"}, {regex: "\\/\\.git\\/"}, {regex: "\\/obsidian-livesync\\/"}];
const defaultSkipPatternXPlat = [...defaultSkipPattern, {regex: "\\/workspace$"} ,{regex: "\\/workspace.json$"}];
let patternSetSetting: PatternSetSetting = null;
new Setting(containerSyncSettingEl)
.setName("Skip patterns")
.setDesc(
"Regular expression, If you use hidden file sync between desktop and mobile, adding `workspace$` is recommended."
"Files that will not be synced to the database. If you use hidden file sync between desktop and mobile, adding `workspace$` is recommended."
)
.addTextArea((text) => {
text
.setValue(this.plugin.settings.syncInternalFilesIgnorePatterns)
.setPlaceholder("\\/node_modules\\/, \\/\\.git\\/")
.onChange(async (value) => {
this.plugin.settings.syncInternalFilesIgnorePatterns = value;
await this.plugin.saveSettings();
})
skipPatternTextArea = text;
return text;
}
);
.then(createPatternSetSetting(this.plugin.settings.syncInternalFilesIgnorePatterns as Pattern[], (component) => {
patternSetSetting = component;
component.onChange(async (patterns) => {
this.plugin.internalFilesIgnorePatterns = patterns;
this.plugin.settings.syncInternalFilesIgnorePatterns = patterns.entries();
await this.plugin.saveSettings();
})
}));
new Setting(containerSyncSettingEl)
.setName("Restore the skip pattern to default")
.addButton((button) => {
button.setButtonText("Default")
.onClick(async () => {
skipPatternTextArea.setValue(defaultSkipPattern);
this.plugin.settings.syncInternalFilesIgnorePatterns = defaultSkipPattern;
await this.plugin.saveSettings();
patternSetSetting.resetTo(defaultSkipPattern);
})
}).addButton((button) => {
button.setButtonText("Cross-platform")
.onClick(async () => {
skipPatternTextArea.setValue(defaultSkipPatternXPlat);
this.plugin.settings.syncInternalFilesIgnorePatterns = defaultSkipPatternXPlat;
await this.plugin.saveSettings();
patternSetSetting.resetTo(defaultSkipPatternXPlat);
})
})

Expand Down
Loading