summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-04-10 13:16:38 -0400
committerJune McEnroe <june@causal.agency>2020-04-10 13:16:38 -0400
commitcc641ff33aa6421efc0ae84cfdfc61251406c2df (patch)
tree15f7a31179f41f018662d2fe0f18b449d41c47df
parentRename exportThreads to exportFetch (diff)
downloadbubger-cc641ff33aa6421efc0ae84cfdfc61251406c2df.tar.gz
bubger-cc641ff33aa6421efc0ae84cfdfc61251406c2df.zip
Fetch thread root envelopes for concat
-rw-r--r--Makefile1
-rw-r--r--archive.c15
-rw-r--r--archive.h2
-rw-r--r--concat.c47
4 files changed, 63 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 000620e..bdb5986 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ LDLIBS = -ltls
 
 OBJS += archive.o
 OBJS += atom.o
+OBJS += concat.o
 OBJS += export.o
 OBJS += html.o
 OBJS += imap.o
diff --git a/archive.c b/archive.c
index ea2259c..c2e7f5c 100644
--- a/archive.c
+++ b/archive.c
@@ -103,11 +103,14 @@ int main(int argc, char *argv[]) {
 		if (!pass) errx(EX_CONFIG, ENV_PASSWORD " unset");
 	}
 
-	uint32_t uidNext = 0;
 	enum Atom login = 0;
 	enum Atom examine = atom("EXAMINE");
 	enum Atom thread = atom("THREAD");
 	enum Atom export = 0;
+	enum Atom concat = 0;
+
+	uint32_t uidNext = 0;
+	struct List threads = {0};
 
 	FILE *imap = imapOpen(host, port);
 	for (struct Resp resp; resp = imapResp(imap), resp.resp != AtomBye;) {
@@ -172,7 +175,10 @@ int main(int argc, char *argv[]) {
 			}
 			createDir("UID");
 			createDir("message");
-			export = exportFetch(imap, resp.data);
+			threads = resp.data;
+			resp.data = (struct List) {0};
+			export = exportFetch(imap, threads);
+			if (!export) concat = concatFetch(imap, threads);
 		}
 
 		if (export && resp.resp == AtomFetch) {
@@ -182,6 +188,11 @@ int main(int argc, char *argv[]) {
 			exportData(resp.data.ptr[0].list);
 		}
 
+		if (export && resp.tag == export) {
+			export = 0;
+			concat = concatFetch(imap, threads);
+		}
+
 		respFree(resp);
 	}
 	fclose(imap);
diff --git a/archive.h b/archive.h
index f588a09..872bf00 100644
--- a/archive.h
+++ b/archive.h
@@ -67,6 +67,8 @@ static inline void envelopeFree(struct Envelope envelope) {
 enum Atom exportFetch(FILE *imap, struct List threads);
 void exportData(struct List items);
 
+enum Atom concatFetch(FILE *imap, struct List threads);
+
 #define TEMPLATE(...) #__VA_ARGS__
 
 struct Variable {
diff --git a/concat.c b/concat.c
new file mode 100644
index 0000000..217662a
--- /dev/null
+++ b/concat.c
@@ -0,0 +1,47 @@
+/* Copyright (C) 2020  C. McEnroe <june@causal.agency>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <err.h>
+#include <inttypes.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sysexits.h>
+
+#include "archive.h"
+#include "imap.h"
+
+static uint32_t threadRoot(struct List thread) {
+	if (!thread.len) errx(EX_PROTOCOL, "empty thread");
+	while (thread.ptr[0].type == List) {
+		thread = thread.ptr[0].list;
+		if (!thread.len) errx(EX_PROTOCOL, "empty subthread");
+	}
+	if (thread.ptr[0].type != Number) errx(EX_PROTOCOL, "invalid thread root");
+	return thread.ptr[0].number;
+}
+
+enum Atom concatFetch(FILE *imap, struct List threads) {
+	enum Atom tag = atom("concatFetch");
+	fprintf(imap, "%s UID FETCH ", Atoms[tag]);
+	for (size_t i = 0; i < threads.len; ++i) {
+		if (threads.ptr[i].type != List) errx(EX_PROTOCOL, "invalid thread");
+		uint32_t root = threadRoot(threads.ptr[i].list);
+		fprintf(imap, "%s%" PRIu32, (i ? "," : ""), root);
+	}
+	fprintf(imap, " (UID ENVELOPE)\r\n");
+	return tag;
+}