deblan-mirror/abraunegg-onedrive
deblan-mirror/abraunegg-onedrive
1
0
Fork 0
mirror of https://github.com/abraunegg/onedrive synced 2024-05-14 03:36:52 +02:00
Code Issues Projects Releases Wiki Activity

use wildcards instead of regex

Browse source
This commit is contained in:
skilion 2015-09-19 09:45:45 +02:00
parent 10efa036b4
commit 59d7c0c311
3 changed files with 42 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/monitor.d
View file

@ -2,7 +2,7 @@ import core.sys.linux.sys.inotify;
import core.sys.posix.poll;
import core.sys.posix.unistd;
import std.exception, std.file, std.path, std.regex, std.stdio, std.string;
import config;
import config, util;
// relevant inotify events
private immutable uint32_t mask = IN_ATTRIB | IN_CLOSE_WRITE | IN_CREATE |
@ -40,8 +40,8 @@ struct Monitor
void init(Config cfg, bool verbose)
{
this.verbose = verbose;
skipDir = regex(cfg.get("skip_dir", ""));
skipFile = regex(cfg.get("skip_file", ""));
skipDir = regex(wild2regex(cfg.get("skip_dir", "")));
skipFile = regex(wild2regex(cfg.get("skip_file", "")));
fd = inotify_init();
if (fd == -1) throw new MonitorException("inotify_init failed");
if (!buffer) buffer = new void[4096];

14
src/sync.d
View file

@ -67,8 +67,8 @@ final class SyncEngine
this.onedrive = onedrive;
this.itemdb = itemdb;
this.verbose = verbose;
skipDir = regex(cfg.get("skip_dir", ""));
skipFile = regex(cfg.get("skip_file", ""));
skipDir = regex(wild2regex(cfg.get("skip_dir", "")));
skipFile = regex(wild2regex(cfg.get("skip_file", "")));
}
void setStatusToken(string statusToken)
@ -322,11 +322,17 @@ final class SyncEngine
if (verbose) writeln(item.id, " ", item.name);
final switch (item.type) {
case ItemType.dir:
if (!matchFirst(item.name, skipDir).empty) break;
if (!matchFirst(item.name, skipDir).empty) {
if (verbose) writeln("Filtered out");
break;
}
uploadDirDifferences(item);
break;
case ItemType.file:
if (!matchFirst(item.name, skipFile).empty) break;
if (!matchFirst(item.name, skipFile).empty) {
if (verbose) writeln("Filtered out");
break;
}
uploadFileDifferences(item);
break;
}

29
src/util.d
View file

@ -42,3 +42,32 @@ string computeCrc32(string path)
}
return crc.finish().toHexString().dup;
}
// convert wildcards (*, ?) to regex
string wild2regex(const(char)[] pattern)
{
string regex;
regex.reserve(pattern.length + 2);
regex ~= "^";
foreach (c; pattern) {
switch (c) {
case '*':
regex ~= ".*";
break;
case '.':
regex ~= "\\.";
break;
case '?':
regex ~= ".";
break;
case '|':
regex ~= "$|^";
break;
default:
regex ~= c;
break;
}
}
regex ~= "$";
return regex;
}