about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--scoop.c224
1 files changed, 134 insertions, 90 deletions
diff --git a/scoop.c b/scoop.c
index d8e7607..5c00c6b 100644
--- a/scoop.c
+++ b/scoop.c
@@ -25,6 +25,127 @@
 
 #include "database.h"
 
+struct Event {
+	const char *network;
+	const char *context;
+	const char *time;
+	enum Type type;
+	const char *nick;
+	const char *user;
+	const char *host;
+	const char *target;
+	const char *message;
+};
+
+typedef void Format(bool group, struct Event event);
+
+static void formatPlain(bool group, struct Event e) {
+	(void)group;
+	if (!e.target) e.target = "";
+	if (!e.message) e.message = "";
+	
+	printf("%s/%s: [%s] ", e.network, e.context, e.time);
+	switch (e.type) {
+		break; case Privmsg: {
+			printf("<%s> %s\n", e.nick, e.message);
+		}
+		break; case Notice: {
+			printf("-%s- %s\n", e.nick, e.message);
+		}
+		break; case Action: {
+			printf("* %s %s\n", e.nick, e.message);
+		}
+		break; case Join: {
+			printf("%s joined\n", e.nick);
+		}
+		break; case Part: {
+			printf("%s parted: %s\n", e.nick, e.message);
+		}
+		break; case Quit: {
+			printf("%s quit: %s\n", e.nick, e.message);
+		}
+		break; case Kick: {
+			printf("%s kicked %s: %s\n", e.nick, e.target, e.message);
+		}
+		break; case Nick: {
+			printf("%s changed nick to %s\n", e.nick, e.target);
+		}
+		break; case Topic: {
+			printf("%s set the topic: %s\n", e.nick, e.message);
+		}
+	}
+}
+
+static const int Colors[] = {
+	31, 32, 33, 34, 35, 36, 37,
+	90, 91, 92, 93, 94, 95, 96, 97,
+};
+
+static int color(const char *user) {
+	if (*user == '~') user++;
+	uint32_t hash = 0;
+	for (; *user; ++user) {
+		hash = (hash << 5) | (hash >> 27);
+		hash ^= *user;
+		hash *= 0x27220A95;
+	}
+	return Colors[hash % ARRAY_LEN(Colors)];
+}
+
+static void formatColor(bool group, struct Event e) {
+	if (!e.target) e.target = "";
+	if (!e.message) e.message = "";
+
+	static char network[256];
+	static char context[256];
+	if (group && (strcmp(e.network, network) || strcmp(e.context, context))) {
+		printf("%s%s/%s:\n", (network[0] ? "\n" : ""), e.network, e.context);
+		snprintf(network, sizeof(network), "%s", e.network);
+		snprintf(context, sizeof(context), "%s", e.context);
+	} else if (!group) {
+		printf("%s/%s: ", e.network, e.context);
+	}
+	printf("[%s] ", e.time);
+
+#define NICK "\33[%dm%s\33[m"
+	switch (e.type) {
+		break; case Privmsg: {
+			printf("<" NICK "> %s\n", color(e.user), e.nick, e.message);
+		}
+		break; case Notice: {
+			printf("-" NICK "- %s\n", color(e.user), e.nick, e.message);
+		}
+		break; case Action: {
+			printf("* " NICK " %s\n", color(e.user), e.nick, e.message);
+		}
+		break; case Join: {
+			printf(NICK " joined\n", color(e.user), e.nick);
+		}
+		break; case Part: {
+			printf(NICK " parted: %s\n", color(e.user), e.nick, e.message);
+		}
+		break; case Quit: {
+			printf(NICK " quit: %s\n", color(e.user), e.nick, e.message);
+		}
+		break; case Kick: {
+			printf(
+				NICK " kicked %s: %s\n",
+				color(e.user), e.nick, e.target, e.message
+			);
+		}
+		break; case Nick: {
+			printf(
+				NICK " changed nick to " NICK "\n",
+				color(e.user), e.nick, color(e.user), e.target
+			);
+		}
+		break; case Topic: {
+			printf(NICK "set the topic: %s\n", color(e.user), e.nick, e.message);
+		}
+	}
+#undef NICK
+}
+
 static const char *Inner = SQL(
 	SELECT
 		contexts.network,
@@ -36,6 +157,7 @@ static const char *Inner = SQL(
 			THEN names.nick
 			ELSE names.user
 		END,
+		names.host,
 		events.target,
 		highlight(search, 6, :open, :close),
 		events.event
@@ -71,86 +193,6 @@ static const char *Group = SQL(
 	ORDER BY network, context, time, event
 );
 
-typedef void Format(
-	const char *network, const char *context, const char *time, enum Type type,
-	const char *nick, const char *user, const char *target, const char *message
-);
-
-static void formatPlain(
-	const char *network, const char *context, const char *time, enum Type type,
-	const char *nick, const char *user, const char *target, const char *message
-) {
-	(void)user;
-	if (!target) target = "";
-	if (!message) message = "";
-	printf("%s/%s: [%s] ", network, context, time);
-	switch (type) {
-		break; case Privmsg: printf("<%s> %s\n", nick, message);
-		break; case Notice: printf("-%s- %s\n", nick, message);
-		break; case Action: printf("* %s %s\n", nick, message);
-		break; case Join: printf("%s joined\n", nick);
-		break; case Part: printf("%s parted: %s\n", nick, message);
-		break; case Quit: printf("%s quit: %s\n", nick, message);
-		break; case Kick: printf("%s kicked %s: %s\n", nick, target, message);
-		break; case Nick: printf("%s changed nick to %s\n", nick, target);
-		break; case Topic: printf("%s set the topic: %s\n", nick, message);
-	}
-}
-
-static const int Colors[] = {
-	31, 32, 33, 34, 35, 36, 37,
-	90, 91, 92, 93, 94, 95, 96, 97,
-};
-
-static int color(const char *user) {
-	if (*user == '~') user++;
-	uint32_t hash = 0;
-	for (; *user; ++user) {
-		hash = (hash << 5) | (hash >> 27);
-		hash ^= *user;
-		hash *= 0x27220A95;
-	}
-	return Colors[hash % ARRAY_LEN(Colors)];
-}
-
-static void formatColor(
-	const char *network, const char *context, const char *time, enum Type type,
-	const char *nick, const char *user, const char *target, const char *message
-) {
-	if (!target) target = "";
-	if (!message) message = "";
-	printf("%s/%s: [%s] ", network, context, time);
-	switch (type) {
-		break; case Privmsg:
-			printf("<\33[%dm%s\33[m> %s\n", color(user), nick, message);
-		break; case Notice:
-			printf("-\33[%dm%s\33[m- %s\n", color(user), nick, message);
-		break; case Action:
-			printf("* \33[%dm%s\33[m %s\n", color(user), nick, message);
-		break; case Join:
-			printf("\33[%dm%s\33[m joined\n", color(user), nick);
-		break; case Part:
-			printf("\33[%dm%s\33[m parted: %s\n", color(user), nick, message);
-		break; case Quit:
-			printf("\33[%dm%s\33[m quit: %s\n", color(user), nick, message);
-		break; case Kick:
-			printf(
-				"\33[%dm%s\33[m kicked %s: %s\n",
-				color(user), nick, target, message
-			);
-		break; case Nick:
-			printf(
-				"\33[%dm%s\33[m changed nick to \33[%dm%s\33[m\n",
-				color(user), nick, color(user), target
-			);
-		break; case Topic:
-			printf(
-				"\33[%dm%s\33[m set the topic: %s\n",
-				color(user), nick, message
-			);
-	}
-}
-
 static const char *TypeNames[] = {
 #define X(id, name) [id] = name,
 	ENUM_TYPE
@@ -290,16 +332,18 @@ int main(int argc, char *argv[]) {
 
 	int result;
 	while (SQLITE_ROW == (result = sqlite3_step(stmt))) {
-		int i = 0;
-		const char *network = (const char *)sqlite3_column_text(stmt, i++);
-		const char *context = (const char *)sqlite3_column_text(stmt, i++);
-		const char *time = (const char *)sqlite3_column_text(stmt, i++);
-		enum Type type = sqlite3_column_int(stmt, i++);
-		const char *nick = (const char *)sqlite3_column_text(stmt, i++);
-		const char *user = (const char *)sqlite3_column_text(stmt, i++);
-		const char *target = (const char *)sqlite3_column_text(stmt, i++);
-		const char *message = (const char *)sqlite3_column_text(stmt, i++);
-		format(network, context, time, type, nick, user, target, message);
+		struct Event event = {
+			.network = (const char *)sqlite3_column_text(stmt, 0),
+			.context = (const char *)sqlite3_column_text(stmt, 1),
+			.time    = (const char *)sqlite3_column_text(stmt, 2),
+			.type    = sqlite3_column_int(stmt, 3),
+			.nick    = (const char *)sqlite3_column_text(stmt, 4),
+			.user    = (const char *)sqlite3_column_text(stmt, 5),
+			.host    = (const char *)sqlite3_column_text(stmt, 6),
+			.target  = (const char *)sqlite3_column_text(stmt, 7),
+			.message = (const char *)sqlite3_column_text(stmt, 8),
+		};
+		format(group, event);
 	}
 	if (result != SQLITE_DONE) warnx("%s", sqlite3_errmsg(db));
 
many of its functions as macros which causes a stream of compilation errors. Defining our own "sane" isgraph() using Git's sane isprint() and isspace() avoids all of these problems. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13cgit.h: move stdbool.h from ui-shared.hJohn Keeping Follow the Git policy of including system headers in only one place. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13cache.c: fix header orderJohn Keeping git-compat-util.h may define values that affect how system headers are interpreted, so move sys/sendfile.h after cgit.h (which includes git-compat-util.h). Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13configfile.c: don't include system headers directlyJohn Keeping git-compat-util.h may define various values that affect the interpretation of system headers. In most places we include cgit.h first, which pulls in git-compat-util.h, but this file does not depend on anything else in CGit, so use git-compat-util.h directly. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13Remove redundant includesJohn Keeping These are all included in git-compat-util.h (when necessary), which we include in cgit.h. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13Makefile: include Git's config.mak.unameJohn Keeping This pulls in the correct value of $(INSTALL) on a wide variety of systems. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13tests: allow shell to be overriddenJohn Keeping On some systems (e.g. Solaris), /bin/sh is not a POSIX shell. Git already provides suitable overrides in its config.mak.uname file and we provide cgit.conf to allow the user to further change this. The code for this is taken from Git's t/Makefile, meaning that we now invoke the tests in the same way that Git does. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-13redirect: cleanlinessJason A. Donenfeld 2015-08-13redirect: be more careful for different cgi setupsJason A. Donenfeld 2015-08-12ui-log: fix double countingJohn Keeping This crept in while rebasing the previous commit onto an updated upstream. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12log: allow users to follow a fileJohn Keeping Teach the "log" UI to behave in the same way as "git log --follow", when given a suitable instruction by the user. The default behaviour remains to show the log without following renames, but the follow behaviour can be activated by following a link in the page header. Follow is not the default because outputting merges in follow mode is tricky ("git log --follow" will not show merges). We also disable the graph in follow mode because the commit graph is not simplified so we end up with frequent gaps in the graph and many lines that do not connect with any commits we're actually showing. We also teach the "diff" and "commit" UIs to respect the follow flag on URLs, causing the single-file version of these UIs to detect renames. This feature is needed only for commits that rename the path we're interested in. For commits before the file has been renamed (i.e. that appear later in the log list) we change the file path in the links from the log to point to the old name; this means that links to commits always limit by the path known to that commit. If we didn't do this we would need to walk down the log diff'ing every commit whenever we want to show a commit. The drawback is that the "Log" link in the top bar of such a page links to the log limited by the old name, so it will only show pre-rename commits. I consider this a reasonable trade-off since the "Back" button still works and the log matches the path displayed in the top bar. Since following renames requires running diff on every commit we consider, I've added a knob to the configuration file to globally enable/disable this feature. Note that we may consider a large number of commits the revision walking machinery no longer performs any path limitation so we have to examine every commit until we find a page full of commits that affect the target path or something related to it. Suggested-by: René Neumann <necoro@necoro.eu> Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12shared: make cgit_diff_tree_cb publicJohn Keeping This will allow us to use this nice wrapper function elsewhere, avoiding dealing with the diff queue when we only need to inspect a filepair. Signed-off-by: John Keeping <john@keeping.me.uk> 2015-08-12t0110: Chain together using &&Jason A. Donenfeld 2015-08-12about: always ensure page has a trailing slashJason A. Donenfeld Otherwise we can't easily embed links to other /about/ pages. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> 2015-08-12filters: apply HTML escapingLazaros Koromilas http://www.w3.org/International/questions/qa-escapes#use 2015-08-12git: update to v2.5.0Christian Hesse Update to git version v2.5.0. * Upstream commit 5455ee0573a22bb793a7083d593ae1ace909cd4c (Merge branch 'bc/object-id') changed API: for_each_ref() callback functions were taught to name the objects not with "unsigned char sha1[20]" but with "struct object_id". * Upstream commit dcf692625ac569fefbe52269061230f4fde10e47 (path.c: make get_pathname() call sites return const char *) Signed-off-by: Christian Hesse <mail@eworm.de> 2015-08-12Fix processing of repo.hide and repo.ignoreDaniel Reichelt