commit 2eff3ff

Most CSV import code has been moved to their own functions.

 1@@ -404,6 +404,10 @@ void verify_links(snac *user);
 2 
 3 void export_csv(snac *user);
 4 int migrate_account(snac *user);
 5+
 6+void import_blocked_accounts_csv(snac *user, const char *fn);
 7+void import_following_accounts_csv(snac *user, const char *fn);
 8+void import_list_csv(snac *user, const char *fn);
 9 void import_csv(snac *user);
10 
11 typedef enum {

 1@@ -670,13 +670,11 @@ void export_csv(snac *user)
 2 }
 3 
 4 
 5-void import_csv(snac *user)
 6-/* import CSV files from Mastodon */
 7+void import_blocked_accounts_csv(snac *user, const char *fn)
 8+/* imports a Mastodon CSV file of blocked accounts */
 9 {
10     FILE *f;
11-    const char *fn;
12 
13-    fn = "blocked_accounts.csv";
14     if ((f = fopen(fn, "r")) != NULL) {
15         snac_log(user, xs_fmt("Importing from %s...", fn));
16 
17@@ -704,8 +702,14 @@ void import_csv(snac *user)
18     }
19     else
20         snac_log(user, xs_fmt("Cannot open file %s", fn));
21+}
22+
23+
24+void import_following_accounts_csv(snac *user, const char *fn)
25+/* imports a Mastodon CSV file of accounts to follow */
26+{
27+    FILE *f;
28 
29-    fn = "following_accounts.csv";
30     if ((f = fopen(fn, "r")) != NULL) {
31         snac_log(user, xs_fmt("Importing from %s...", fn));
32 
33@@ -757,8 +761,14 @@ void import_csv(snac *user)
34     }
35     else
36         snac_log(user, xs_fmt("Cannot open file %s", fn));
37+}
38+
39+
40+void import_list_csv(snac *user, const char *fn)
41+/* imports a Mastodon CSV file list */
42+{
43+    FILE *f;
44 
45-    fn = "lists.csv";
46     if ((f = fopen(fn, "r")) != NULL) {
47         snac_log(user, xs_fmt("Importing from %s...", fn));
48 
49@@ -808,6 +818,20 @@ void import_csv(snac *user)
50     }
51     else
52         snac_log(user, xs_fmt("Cannot open file %s", fn));
53+}
54+
55+
56+void import_csv(snac *user)
57+/* import CSV files from Mastodon */
58+{
59+    FILE *f;
60+    const char *fn;
61+
62+    import_blocked_accounts_csv(user, "blocked_accounts.csv");
63+
64+    import_following_accounts_csv(user, "following_accounts.csv");
65+
66+    import_list_csv(user, "lists.csv");
67 
68     fn = "bookmarks.csv";
69     if ((f = fopen(fn, "r")) != NULL) {