X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.c;h=291647e79f4c3930fec1d9ae7c9ccb45718f4695;hb=a5c969e80989ea2c678a99b46e7db08ae553e59d;hp=4a663b18cd4c6d728ceff29ef35a5b1875e797a0;hpb=52210ae670b22ce2d187bd2dc943fd8ae3f4a8c0;p=ypp-sc-tools.db-live.git

diff --git a/pctb/convert.c b/pctb/convert.c
index 4a663b1..291647e 100644
--- a/pctb/convert.c
+++ b/pctb/convert.c
@@ -1,3 +1,29 @@
+/*
+ * ypp-commodities main program: argument parsing etc.
+ */
+/*
+ *  This is part of ypp-sc-tools, a set of third-party tools for assisting
+ *  players of Yohoho Puzzle Pirates.
+ * 
+ *  Copyright (C) 2009 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * 
+ *  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 <http://www.gnu.org/licenses/>.
+ * 
+ *  Yohoho and Puzzle Pirates are probably trademarks of Three Rings and
+ *  are used without permission.  This program is not endorsed or
+ *  sponsored by Three Rings.
+ */
 
 #include "convert.h"
 
@@ -23,17 +49,19 @@ static enum {
 
 static char *o_screenshots_fn;
 static int o_single_page, o_quiet;
+static const char *o_outputmode= "upload";
 
 FILE *screenshots_file;
 
 
-static void badusage(const char *fmt, ...)
-     __attribute__((format(printf,1,2),noreturn));
-static void badusage(const char *fmt, ...) {
-  va_list al;
-  va_start(al,fmt);
+static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
+static void vbadusage(const char *fmt, va_list al) {
+  fputs("bad usage: ",stderr);
+  vfprintf(stderr,fmt,al);
+  fputc('\n',stderr);
   exit(12);
 }
+DEFINE_VWRAPPERF(static, badusage, NORET);
 
 static void open_screenshots_file(const char *mode) {
   screenshots_file= fopen(o_screenshots_fn, mode);
@@ -42,6 +70,31 @@ static void open_screenshots_file(const char *mode) {
 	  o_screenshots_fn, strerror(errno));
 }
 
+static void run_analysis(void) {
+  FILE *tf;
+
+  sysassert( tf= tmpfile() );
+  progress("running recognition...");
+  analyse(tf);
+
+  sysassert( fseek(tf,0,SEEK_SET) == 0);
+
+  progress_log("processing results (--%s)...", o_outputmode);
+  pid_t processor;
+  sysassert( (processor= fork()) != -1 );
+
+  if (!processor) {
+    sysassert( dup2(fileno(tf),0) ==0 );
+    execlp("./yppsc-commod-processor", "yppsc-commod-processor",
+	   o_outputmode, (char*)0);
+    sysassert(!"execlp commod-processor failed");
+  }
+
+  waitpid_check_exitstatus(processor, "output processor/uploader");
+  fclose(tf);
+  progress_log("all complete.");
+}  
+
 int main(int argc, char **argv) {
   const char *arg;
   int r;
@@ -54,12 +107,18 @@ int main(int argc, char **argv) {
       o_mode= mode_findwindow;
     else if (!strcmp(arg,"--screenshot-only"))
       o_mode= mode_screenshot;
-    else if (!strcmp(arg,"--analyse-only"))
+    else if (!strcmp(arg,"--analyse-only") ||
+	     !strcmp(arg,"--same"))
       o_mode= mode_analyse;
     else if (!strcmp(arg,"--single-page"))
       o_single_page= 1;
     else if (!strcmp(arg,"--quiet"))
       o_quiet= 1;
+    else if (!strcmp(arg,"--upload") ||
+	     !strcmp(arg,"--arbitrage") ||
+	     !strcmp(arg,"--tsv") ||
+	     !strcmp(arg,"--best-prices"))
+      o_outputmode= arg+2;
     else if (!strcmp(arg,"--screenshots-file"))
       o_screenshots_fn= ARGVAL;
 #define DF(f)					\
@@ -96,8 +155,7 @@ int main(int argc, char **argv) {
     else read_screenshots();
   }
   if (o_mode & mf_analyse) {
-    analyse();
-    //output_tsv();
+    run_analysis();
   }
   return 0;
 }
@@ -198,3 +256,25 @@ void *mrealloc(void *p, size_t sz) {
   sysassert( r= realloc(p,sz) );
   return r;
 }
+
+void waitpid_check_exitstatus(pid_t pid, const char *what) { 
+  pid_t got;
+  int st;
+  for (;;) {
+    got= waitpid(pid, &st, 0);
+    if (pid==-1) { sysassert(errno==EINTR); continue; }
+    break;
+  }
+  sysassert( got==pid );
+
+  if (WIFEXITED(st)) {
+    if (WEXITSTATUS(st))
+      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)":"");
+  } else {
+    fatal("%s gave strange wait status %d", what, st);
+  }
+}