open.source/wyebadblock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Checking system data dirs for list file

Browse Source
This commit is contained in:
jun7 2018-06-06 16:40:52 +09:00
parent 881c84fc95
commit d5f8e3fbec
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ab.c
View File

@ -121,7 +121,7 @@ G_MODULE_EXPORT void webkit_web_extension_initialize_with_user_data(
static EphyUriTester *tester = NULL; static EphyUriTester *tester = NULL;
static GThread *initt = NULL; static GThread *initt = NULL;
static gpointer inittcb(gpointer data) static gpointer inittcb(gpointer p)
{ {
ephy_uri_tester_load(tester); ephy_uri_tester_load(tester);
return NULL; return NULL;
@ -134,11 +134,9 @@ static void monitorcb(
e == G_FILE_MONITOR_EVENT_DELETED) e == G_FILE_MONITOR_EVENT_DELETED)
exit(0); exit(0);
} }
static void init() static bool tryload(const char *parent)
{ {
DD(wyebad init) char *path = g_build_filename(parent, DIRNAME, LISTNAME, NULL);
char *path = g_build_filename(
g_get_user_config_dir(), DIRNAME, "easylist.txt", NULL);
GFile *gf = g_file_new_for_path(path); GFile *gf = g_file_new_for_path(path);
GFileMonitor *gm = g_file_monitor_file(gf, GFileMonitor *gm = g_file_monitor_file(gf,
@ -150,16 +148,23 @@ static void init()
{ {
filter_file = g_file_new_for_path(path); filter_file = g_file_new_for_path(path);
tester = ephy_uri_tester_new("/foo/bar"); tester = ephy_uri_tester_new("/foo/bar");
initt = g_thread_new("init", inittcb, NULL); initt = g_thread_new("init", inittcb, NULL);
} else { }
char *dir = g_path_get_dirname(path); g_free(path);
return tester;
}
static void init()
{
DD(wyebad init)
if (tryload(g_get_user_config_dir())) return;
for (const gchar * const *d = g_get_system_data_dirs(); *d; d++)
if (tryload(*d)) return;
char *dir = g_build_filename(g_get_user_config_dir(), DIRNAME, NULL);
if (!g_file_test(dir, G_FILE_TEST_EXISTS)) if (!g_file_test(dir, G_FILE_TEST_EXISTS))
g_mkdir_with_parents(dir, 0700); g_mkdir_with_parents(dir, 0700);
g_free(dir); g_free(dir);
}
g_free(path);
} }
static char *datafunc(char *req) static char *datafunc(char *req)

3
makefile
View File

@ -1,3 +1,4 @@
LISTNAME=easylist.txt
EXTENSION_DIR=$(DESTDIR)/usr/lib/wyebrowser EXTENSION_DIR=$(DESTDIR)/usr/lib/wyebrowser
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
CFLAGS += -Wall CFLAGS += -Wall
@ -17,7 +18,7 @@ adblock.so: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile
wyebab: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile wyebab: ab.c ephy-uri-tester.c ephy-uri-tester.h librun.o makefile
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o \ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< librun.o \
`pkg-config --cflags --libs glib-2.0 gio-2.0` \ `pkg-config --cflags --libs glib-2.0 gio-2.0` \
$(DDEBUG) -DDIRNAME=\"wyebadblock\" $(DDEBUG) -DDIRNAME=\"wyebadblock\" -DLISTNAME=\"$(LISTNAME)\"
librun.o: wyebrun.c wyebrun.h makefile librun.o: wyebrun.c wyebrun.h makefile
$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $< -fPIC\ $(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $< -fPIC\