commit 6f50152

Read CSV files to import from the import/ user subdirectory.

 1@@ -696,10 +696,12 @@ void export_csv(snac *user)
 2 }
 3 
 4 
 5-void import_blocked_accounts_csv(snac *user, const char *fn)
 6+void import_blocked_accounts_csv(snac *user, const char *ifn)
 7 /* imports a Mastodon CSV file of blocked accounts */
 8 {
 9     FILE *f;
10+    xs *l = xs_split(ifn, "/");
11+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
12 
13     if ((f = fopen(fn, "r")) != NULL) {
14         snac_log(user, xs_fmt("Importing from %s...", fn));
15@@ -731,10 +733,12 @@ void import_blocked_accounts_csv(snac *user, const char *fn)
16 }
17 
18 
19-void import_following_accounts_csv(snac *user, const char *fn)
20+void import_following_accounts_csv(snac *user, const char *ifn)
21 /* imports a Mastodon CSV file of accounts to follow */
22 {
23     FILE *f;
24+    xs *l = xs_split(ifn, "/");
25+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
26 
27     if ((f = fopen(fn, "r")) != NULL) {
28         snac_log(user, xs_fmt("Importing from %s...", fn));
29@@ -790,10 +794,12 @@ void import_following_accounts_csv(snac *user, const char *fn)
30 }
31 
32 
33-void import_list_csv(snac *user, const char *fn)
34+void import_list_csv(snac *user, const char *ifn)
35 /* imports a Mastodon CSV file list */
36 {
37     FILE *f;
38+    xs *l = xs_split(ifn, "/");
39+    xs *fn = xs_fmt("%s/import/%s", user->basedir, xs_list_get(l, -1));
40 
41     if ((f = fopen(fn, "r")) != NULL) {
42         snac_log(user, xs_fmt("Importing from %s...", fn));
43@@ -851,7 +857,6 @@ void import_csv(snac *user)
44 /* import CSV files from Mastodon */
45 {
46     FILE *f;
47-    const char *fn;
48 
49     import_blocked_accounts_csv(user, "blocked_accounts.csv");
50 
51@@ -859,7 +864,7 @@ void import_csv(snac *user)
52 
53     import_list_csv(user, "lists.csv");
54 
55-    fn = "bookmarks.csv";
56+    xs *fn = xs_fmt("%s/import/bookmarks.csv", user->basedir);
57     if ((f = fopen(fn, "r")) != NULL) {
58         snac_log(user, xs_fmt("Importing from %s...", fn));
59