Changeset 1319Tweet

Timestamp:

11/10/06 08:47:17 (7 years ago)

Author:

sam

Message:

• Use "-F list" to list available filters.
• Use "-E" to specify export format, "-E list" to list them.

Location:

toilet/trunk/src

Files:

• filter.c (modified) (1 diff)
• filter.h (modified) (1 diff)
• main.c (modified) (11 diffs)

toilet/trunk/src/filter.c

@@ -40 +40 @@
     char const *name;
     void (*function)(context_t *);
+    char const *description;
 }
 const lookup[] =
 {
-    { "crop", filter_crop },
-    { "gay", filter_gay },
-    { "metal", filter_metal },
-    { "flip", filter_flip },
-    { "flop", filter_flop },
-    { "rotate", filter_rotate },
+    { "crop", filter_crop, "crop unused blanks" },
+    { "gay", filter_gay, "add a rainbow colour effect" },
+    { "metal", filter_metal, "add a metallic colour effect" },
+    { "flip", filter_flip, "flip horizontally" },
+    { "flop", filter_flop, "flip vertically" },
+    { "rotate", filter_rotate, "perform a 180 degrees rotation" },
 };
+
+int filter_list(void)
+{
+    int i;
+
+    fprintf(stderr, "Available filters:\n");
+    for(i = 0; i < sizeof(lookup) / sizeof(lookup[0]); i++)
+        fprintf(stderr, "\"%s\": %s\n", lookup[i].name, lookup[i].description);
+
+    return 0;
+}
 
 int filter_add(context_t *cx, char const *filter)

toilet/trunk/src/filter.h

@@ -16 +16 @@
  */
 
+extern int filter_list(void);
 extern int filter_add(context_t *, char const *);
 extern int filter_do(context_t *);

toilet/trunk/src/main.c

@@ -29 +29 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <cucul.h>
 
@@ -39 +40 @@
 static void usage(void);
 #endif
+static int export_list(void);
 
 int main(int argc, char *argv[])
@@ -72 +74 @@
             { "gay", 0, NULL, 130 },
             { "metal", 0, NULL, 131 },
+            { "export", 1, NULL, 'E' },
             { "irc", 0, NULL, 140 },
             { "html", 0, NULL, 141 },
-            { "tga", 0, NULL, 142 },
             { "help", 0, NULL, 'h' },
             { "infocode", 1, NULL, 'I' },
@@ -81 +83 @@
         };
 
-        int c = getopt_long(argc, argv, "f:d:w:tF:hI:v",
+        int c = getopt_long(argc, argv, "f:d:w:tF:E:hI:v",
                             long_options, &option_index);
 #   else
 #       define MOREINFO "Try `%s -h' for more information.\n"
-        int c = getopt(argc, argv, "f:d:w:tF:hI:v");
+        int c = getopt(argc, argv, "f:d:w:tF:E:hI:v");
 #   endif
         if(c == -1)
@@ -108 +110 @@
             break;
         case 'F': /* --filter */
-            if(filter_add(cx, optarg))
+            if(!strcmp(optarg, "list"))
+                return filter_list();
+            if(filter_add(cx, optarg) < 0)
                 return -1;
             break;
@@ -132 +136 @@
             break;
         }
+        case 'E': /* --export */
+            if(!strcmp(optarg, "list"))
+                return export_list();
+            cx->export = optarg;
+            break;
         case 140: /* --irc */
             cx->export = "irc";
@@ -137 +146 @@
         case 141: /* --html */
             cx->export = "html";
-            break;
-        case 142: /* --tga */
-            cx->export = "tga";
             break;
         case '?':
@@ -196 +202 @@
     "Usage: toilet [ -htv ] [ -d fontdirectory ]\n" \
     "              [ -f fontfile ] [ -F filter ] [ -w outputwidth ]\n" \
-    "              [ -I infocode ] [ message ]\n"
+    "              [ -I infocode ] [ -E format ] [ message ]\n"
 #else
 #   define USAGE ""
@@ -228 +234 @@
     printf("  -w, --width <width>      set output width\n");
     printf("  -t, --termwidth          adapt to terminal's width\n");
-    printf("  -F, --filter <name>      apply one or several filters to the text\n");
+    printf("  -F, --filter <filters>   apply one or several filters to the text\n");
+    printf("  -F, --filter list        list available filters\n");
     printf("      --gay                rainbow filter (same as -F gay)\n");
     printf("      --metal              metal filter (same as -F metal)\n");
-    printf("      --irc                output IRC colour codes\n");
-    printf("      --html               output an HTML document\n");
-    printf("      --tga                output a TGA image\n");
+    printf("  -E, --export <format>    select export format\n");
+    printf("  -E, --export list        list available export formats\n");
+    printf("      --irc                output IRC colour codes (same as -E irc)\n");
+    printf("      --html               output an HTML document (same as -E html)\n");
     printf("  -h, --help               display this help and exit\n");
     printf("  -I, --infocode <code>    print FIGlet-compatible infocode\n");
@@ -242 +250 @@
     printf("  -w <width>       set output width\n");
     printf("  -t               adapt to terminal's width\n");
-    printf("  -F <name>        apply one or several filters to the text\n");
+    printf("  -F <filters>     apply one or several filters to the text\n");
+    printf("  -F list          list available filters\n");
+    printf("  -E <format>      select export format\n");
+    printf("  -E list          list available export formats\n");
     printf("  -h               display this help and exit\n");
     printf("  -I <code>        print FIGlet-compatible infocode\n");
@@ -250 +261 @@
 #endif
 
+static int export_list(void)
+{
+    char const * const * exports, * const * p;
+
+    exports = cucul_get_export_list();
+
+    printf("Available export formats:\n");
+    for(p = exports; *p; p += 2)
+        printf("\"%s\": %s\n", *p, *(p + 1));
+
+    return 0;
+}
+