Compress the screenshots file on output

[ypp-sc-tools.main.git] / pctb / convert.c

diff --git a/pctb/convert.c b/pctb/convert.c
index 3c5af994c3f7c9db88c8cc22875b7979f6384bad..366ea725191132f4fbc719196d70cec2f2a5765f 100644 (file)
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -66,6 +66,8 @@ FILE *screenshot_file;
 const char *o_ocean, *o_pirate;
 int o_quiet;
 
+static pid_t screenshot_compressor=-1;
+
 enum flags o_flags=
    ff_charset_allowedit |
    ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
@@ -80,10 +82,31 @@ static void vbadusage(const char *fmt, va_list al) {
 DEFINE_VWRAPPERF(static, badusage, NORET);
 
 static void open_screenshot_file(const char *mode) {
-  screenshot_file= fopen(o_screenshot_fn, mode);
-  if (!screenshot_file)
-    fatal("could not open screenshots file `%s': %s",
-         o_screenshot_fn, strerror(errno));
+  if (!fnmatch("*.gz",o_screenshot_fn,0)) {
+    int zfd, pipefds[2];
+    sysassert( (zfd= open(o_screenshot_fn, O_WRONLY|O_CREAT|O_TRUNC,
+                         0666)) >= 0);
+    sysassert(! pipe(pipefds) );
+    sysassert( (screenshot_compressor=fork()) != -1 );
+    if (!screenshot_compressor) {
+      sysassert( dup2(pipefds[0],0)==0 );
+      sysassert( dup2(zfd,1)==1 );
+      sysassert(! close(zfd) );
+      sysassert(! close(pipefds[0]) );
+      sysassert(! close(pipefds[1]) );
+      execlp("gzip","gzip","-1",(char*)0);
+      sysassert(!"execlp gzip for screenshots");
+    }
+    sysassert(! close(zfd) );
+    sysassert(! close(pipefds[0]) );
+    sysassert( screenshot_file= fdopen(pipefds[1], "w") );
+
+  } else {
+    screenshot_file= fopen(o_screenshot_fn, mode);
+    if (!screenshot_file)
+      fatal("could not open screenshots file `%s': %s",
+           o_screenshot_fn, strerror(errno));
+  }
 }
 
 static void run_analysis(void) {
@@ -110,33 +133,40 @@ static void run_analysis(void) {
     EXECLP_HELPER("commod-results-processor", o_outmode_str, (char*)0);
   }
 
-  waitpid_check_exitstatus(processor, "output processor/uploader");
+  waitpid_check_exitstatus(processor, "output processor/uploader", 0);
   fclose(tf);
   progress_log("all complete.");
 }
 
-void fetch_with_rsync(const char *stem) {
+static void rsync_core(const char *stem, const char *suffix,
+                      const char *zopt) {
   pid_t fetcher;
 
+  progress("Updating dictionary %s...",stem);
+
   sysassert( (fetcher= fork()) != -1 );
   if (!fetcher) {
     const char *rsync= getenv("YPPSC_PCTB_RSYNC");
     if (!rsync) rsync= "rsync";
   
     const char *src= getenv("YPPSC_PCTB_DICT_UPDATE");
-    char *remote= masprintf("%s/master-%s.txt", src, stem);
-    char *local= masprintf("#master-%s#.txt", stem);
+    char *remote= masprintf("%s/master-%s.txt%s", src, stem, suffix);
+    char *local= masprintf("_master-%s.txt%s", stem, suffix);
     if (DEBUGP(rsync))
       fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local);
-    execlp(rsync, "rsync",
-          DEBUGP(rsync) ? "-zvLt" : "-zLt",
-          "--",remote,local,(char*)0);
+    char *opts= masprintf("-Lt%s%s",
+                         zopt,
+                         DEBUGP(rsync) ? "v" : "");
+    execlp(rsync, "rsync",opts,"--",remote,local,(char*)0);
     sysassert(!"exec rsync failed");
   }
 
-  waitpid_check_exitstatus(fetcher, "rsync");
+  waitpid_check_exitstatus(fetcher, "rsync", 0);
 }
 
+void fetch_with_rsync_gz(const char *stem) { rsync_core(stem,".gz",""); }
+void fetch_with_rsync(const char *stem) { rsync_core(stem,"","z"); }
+
 static void set_server(const char *envname, const char *defprotocol,
                       const char *defvalue, const char *defvalue_test,
                       const char *userspecified,
@@ -211,7 +241,8 @@ int main(int argc, char **argv) {
             IS("--best-prices"))      o_outmode_kind=omk_str,
                                       o_outmode_str=arg+2;
 
-    else if (IS("--screenshot-file"))  o_screenshot_fn= ARGVAL;
+    else if (IS("--screenshot-file")||
+            IS("--screenshots-file")) o_screenshot_fn= ARGVAL;
     else if (IS("--pctb-server"))         o_serv_pctb=        ARGVAL;
     else if (IS("--dict-submit-server"))  o_serv_dict_submit= ARGVAL;
     else if (IS("--dict-update-server"))  o_serv_dict_fetch=  ARGVAL;
@@ -267,10 +298,13 @@ int main(int argc, char **argv) {
             o_serv_dict_submit,  o_flags & ff_dict_submit);
 
   if (!o_screenshot_fn)
-    o_screenshot_fn= masprintf("%s/#pages#.ppm",get_vardir());
+    o_screenshot_fn= masprintf("%s/_pages.ppm%s", get_vardir(),
+                              o_mode & mf_readscreenshot ? "" : ".gz");
 
   /* Actually do the work */
             
+  canon_colour_prepare();
+  
   if (o_mode & mf_findwindow) {
     screenshot_startup();
     find_yppclient_window();
@@ -297,7 +331,8 @@ int main(int argc, char **argv) {
     open_screenshot_file("w");
     if (o_flags & ff_singlepage) take_one_screenshot();
     else take_screenshots();
-    progress_log("OK for you to move the mouse now.");
+    progress_log("OK for you to move the mouse now, and you can"
+                " use the YPP client again.");
   }
   if (o_mode & mf_readscreenshot) {
     if ((o_flags & ff_upload) && !(o_flags & ff_testservers))
@@ -308,7 +343,7 @@ int main(int argc, char **argv) {
   }
   if (o_mode & mf_analyse) {
     if (o_flags & ff_needisland) {
-      find_islandname(page_images[0]->rgb);
+      find_islandname();
       if (o_flags & ff_printisland)
        printf("%s, %s\n", archipelago, island);
       sysassert(! setenv("YPPSC_ISLAND",island,1) );
@@ -320,6 +355,10 @@ int main(int argc, char **argv) {
     default: abort();
     }
   }
+  if (screenshot_compressor!=-1) {
+    progress("Finishing compressing screenshots...");
+    waitpid_check_exitstatus(screenshot_compressor,"screenshots gzip",0);
+  }
   progress_log("Finished.");
   return 0;
 }
@@ -408,7 +447,7 @@ void sysassert_fail(const char *file, int line, const char *what) {
   _exit(16);
 }
 
-void waitpid_check_exitstatus(pid_t pid, const char *what) { 
+void waitpid_check_exitstatus(pid_t pid, const char *what, int sigpipeok) { 
   pid_t got;
   int st;
   for (;;) {
@@ -423,8 +462,9 @@ void waitpid_check_exitstatus(pid_t pid, const char *what) {
       fatal("%s failed with nonzero exit status %d",
            what, WEXITSTATUS(st));
   } else if (WIFSIGNALED(st)) {
-    fatal("%s died due to signal %s%s", what,
-         strsignal(WTERMSIG(st)), WCOREDUMP(st)?" (core dumped)":"");
+    if (!sigpipeok || WTERMSIG(st) != SIGPIPE)
+      fatal("%s died due to signal %s%s", what,
+           strsignal(WTERMSIG(st)), WCOREDUMP(st)?" (core dumped)":"");
   } else {
     fatal("%s gave strange wait status %d", what, st);
   }