[Qemacs-commit] qemacs archive.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        16/03/06 17:04:26

Modified files:
        .              : archive.c 

Log message:
        archive: improve support for images
        - add mode dependant shell flags
        - add filter for bmp files with img2txt from libcaca package
        - add filter for jpg files with jpg2a from libcaca package
        - add filter for pdf files with pstotext from libcaca package

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/archive.c?cvsroot=qemacs&r1=1.23&r2=1.24

Patches:
Index: archive.c
===================================================================
RCS file: /sources/qemacs/qemacs/archive.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- archive.c   27 Aug 2015 23:03:39 -0000      1.23
+++ archive.c   6 Mar 2016 17:04:26 -0000       1.24
@@ -31,6 +31,7 @@
     const char *extensions;
     const char *list_cmd;       /* list archive contents to stdout */
     const char *extract_cmd;    /* extract archive element to stdout */
+    int sf_flags;
     struct ArchiveType *next;
 };
 
@@ -145,7 +146,7 @@
                   atp->name, b->filename);
         qe_shell_subst(cmd, sizeof(cmd), atp->list_cmd, b->filename, NULL);
         new_shell_buffer(b, get_basename(b->filename), NULL, cmd,
-                         SF_INFINITE | SF_BUFED_MODE);
+                         atp->sf_flags | SF_INFINITE | SF_BUFED_MODE);
 
         /* XXX: should check for archiver error */
         /* XXX: should delay BF_SAVELOG until buffer is fully loaded */
@@ -217,6 +218,7 @@
     const char *extensions;
     const char *load_cmd;       /* uncompress file to stdout */
     const char *save_cmd;       /* compress to file from stdin */
+    int sf_flags;
     struct CompressType *next;
 };
 
@@ -231,6 +233,9 @@
     { "sqlite", "SQLite format 3\0", 16, NULL, "sqlite3 $1 .dump", NULL },
     { "bplist", "bplist00", 8, "plist", "plutil -p $1", NULL },
 //    { "bplist", "bplist00", 8, "plist", "plutil -convert xml1 -o - $1", NULL 
},
+    { "jpeg", NULL, 0, "jpg", "jp2a --height=35 --background=dark $1", NULL, 
SF_COLOR },
+    { "image", NULL, 0, "bmp", "img2txt -f ansi $1", NULL, SF_COLOR  },
+    { "pdf", NULL, 0, "pdf", "pstotext $1", NULL },
 };
 
 static CompressType *compress_types;
@@ -285,7 +290,7 @@
         eb_clear(b);
         qe_shell_subst(cmd, sizeof(cmd), ctp->load_cmd, b->filename, NULL);
         new_shell_buffer(b, get_basename(b->filename), NULL, cmd,
-                         SF_INFINITE | SF_AUTO_CODING | SF_AUTO_MODE);
+                         ctp->sf_flags | SF_INFINITE | SF_AUTO_CODING | 
SF_AUTO_MODE);
         /* XXX: should check for archiver error */
         /* XXX: should delay BF_SAVELOG until buffer is fully loaded */
         b->flags |= BF_READONLY;
@@ -375,6 +380,7 @@
     qe_shell_subst(cmd, sizeof(cmd), "wget -q -O - $1", b->filename, NULL);
     new_shell_buffer(b, get_basename(b->filename), NULL, cmd,
                      SF_INFINITE | SF_AUTO_CODING | SF_AUTO_MODE);
+    /* XXX: should refilter by content type */
     /* XXX: should have a way to keep http headers --save-headers */
     /* XXX: should check for wget error */
     /* XXX: should delay BF_SAVELOG until buffer is fully loaded */