}
const char *get_vardir(void) { return "."; }
+const char *get_libdir(void) { return "."; }
-static enum {
+
+enum mode {
mf_findwindow= 0001,
mf_screenshot= 0010,
mf_readscreenshot= 0020,
mode_analyse= 0120,
mode_all= 0111,
-} o_mode= mode_all;
+};
+static enum mode o_mode= mode_all;
static char *o_screenshot_fn;
-static int o_single_page, o_quiet;
+static int o_quiet;
static const char *o_outputmode= "upload";
+static const char *o_serv_pctb, *o_serv_dict_fetch, *o_serv_dict_submit;
-const char *o_resolver;
+const char *o_resolver= "./dictionary-manager";
FILE *screenshot_file;
+enum flags o_flags= ff_dict_fetch|ff_dict_submit|ff_dict_pirate;
static void vbadusage(const char *fmt, va_list) FMT(1,0) NORET;
static void vbadusage(const char *fmt, va_list al) {
progress("running recognition...");
analyse(tf);
- if (o_single_page && !strcmp(o_outputmode,"upload"))
- fatal("Recognition successful, but refusing to upload partial data\n"
- " (--single-page specified). Specify an output mode?");
+ if (o_flags & ff_upload) {
+ if (o_flags & ff_singlepage)
+ fatal("Recognition successful, but refusing to upload partial data\n"
+ " (--single-page specified). Specify an output mode?");
+ }
sysassert( fseek(tf,0,SEEK_SET) == 0);
if (!processor) {
sysassert( dup2(fileno(tf),0) ==0 );
- execlp("./yppsc-commod-processor", "yppsc-commod-processor",
- o_outputmode, (char*)0);
- sysassert(!"execlp commod-processor failed");
+ EXECLP_HELPER("commod-results-processor", o_outputmode, (char*)0);
}
waitpid_check_exitstatus(processor, "output processor/uploader");
fclose(tf);
progress_log("all complete.");
-}
+}
+
+void fetch_with_rsync(const char *stem) {
+ pid_t fetcher;
+
+ 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);
+ execlp(rsync, "rsync",
+ DEBUGP(rsync) ? "-vLt" : "-Lt",
+ "--",remote,local,(char*)0);
+ sysassert(!"exec rsync failed");
+ }
+
+ waitpid_check_exitstatus(fetcher, "dictionary-manager --update");
+}
+
+static void set_server(const char *envname, const char *defprotocol,
+ const char *defvalue, const char *userspecified,
+ int enable) {
+ const char *value;
+
+ if (!enable) { value= "0"; goto ok; }
+
+ if (userspecified)
+ value= userspecified;
+ else if ((value= getenv(envname)))
+ ;
+ else
+ value= defvalue;
+
+ if (value[0]=='/' || (value[0]=='.' && value[1]=='/'))
+ /* absolute or relative pathname - or anyway, something with no hostname */
+ goto ok;
+
+ const char *colon= strchr(value, ':');
+ const char *slash= strchr(value, '/');
+
+ if (colon && (!slash || colon < slash))
+ /* colon before the first slash, if any */
+ /* rsync :: protocol specification - anyway, adding scheme:// won't help */
+ goto ok;
+
+ value= masprintf("%s%s", defprotocol, value);
+
+ ok:
+ sysassert(! setenv(envname,value,1) );
+}
int main(int argc, char **argv) {
const char *arg;
- int r;
+
+ sysassert( setlocale(LC_MESSAGES,"") );
+ sysassert( setlocale(LC_CTYPE,"en_GB.UTF-8") ||
+ setlocale(LC_CTYPE,"en.UTF-8") );
#define ARGVAL ((*++argv) ? *argv : \
(badusage("missing value for option %s",arg),(char*)0))
+#define IS(s) (!strcmp(arg,(s)))
+
while ((arg=*++argv)) {
- if (!strcmp(arg,"--find-window-only"))
- o_mode= mode_findwindow;
- else if (!strcmp(arg,"--screenshot-only"))
- o_mode= mode_screenshot;
- else if (!strcmp(arg,"--analyse-only") ||
- !strcmp(arg,"--same"))
- o_mode= mode_analyse;
- else if (!strcmp(arg,"--everything"))
- o_mode= mode_all;
- else if (!strcmp(arg,"--single-page"))
- o_single_page= 1;
- else if (!strcmp(arg,"--quiet"))
- o_quiet= 1;
- else if (!strcmp(arg,"--edit-charset"))
- o_resolver= "./yppsc-ocr-resolver";
- else if (!strcmp(arg,"--raw-tsv"))
- o_outputmode= 0;
- else if (!strcmp(arg,"--upload") ||
- !strcmp(arg,"--arbitrage") ||
- !strcmp(arg,"--tsv") ||
- !strcmp(arg,"--best-prices"))
- o_outputmode= arg+2;
- else if (!strcmp(arg,"--screenshot-file"))
- o_screenshot_fn= ARGVAL;
+ if (IS("--find-window-only")) o_mode= mode_findwindow;
+ else if (IS("--screenshot-only")) o_mode= mode_screenshot;
+ else if (IS("--analyse-only") ||
+ IS("--same")) o_mode= mode_analyse;
+ else if (IS("--everything")) o_mode= mode_all;
+ else if (IS("--single-page")) o_flags |= ff_singlepage;
+ else if (IS("--quiet")) o_quiet= 1;
+ else if (IS("--edit-charset")) o_flags |= ff_editcharset;
+ else if (IS("--dict-local-only")) o_flags &= ~ffs_dict;
+ else if (IS("--dict-read-only")) o_flags &= (~ffs_dict | ff_dict_fetch);
+ else if (IS("--dict-anon")) o_flags &= ~ff_dict_pirate;
+ else if (IS("--dict-submit")) o_flags |= ff_dict_fetch|ff_dict_submit;
+ else if (IS("--upload") ||
+ IS("--arbitrage") ||
+ IS("--tsv") ||
+ IS("--best-prices")) o_outputmode= arg+2;
+ else if (IS("--raw-tsv")) o_outputmode= 0;
+ else if (IS("--screenshot-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;
#define DF(f) \
- else if (!strcmp(arg,"-D" #f)) \
+ else if (IS("-D" #f)) \
debug_flags |= dbg_##f;
DEBUG_FLAG_LIST
#undef DF
- else if (!strcmp(arg,"--window-id")) {
+ else if (IS("--window-id")) {
char *ep;
unsigned long windowid= strtoul(ARGVAL,&ep,0);
if (*ep) badusage("invalid window id");
} else
badusage("unknown option `%s'",arg);
}
+
+ /* Consequential changes to options */
- if (!o_screenshot_fn) {
- r= asprintf(&o_screenshot_fn,"%s/#pages#.ppm",get_vardir());
- sysassert(r>=0);
- }
+ if (!strcmp("upload",o_outputmode))
+ o_flags |= ffs_upload;
+ /* Defaults */
+
+ set_server("YPPSC_PCTB_PCTB",
+ "http://", "pctb.ilk.org",
+ o_serv_pctb, o_flags & (ff_needisland|ff_upload));
+
+ set_server("YPPSC_PCTB_DICT_UPDATE",
+ "rsync://", "rsync.pctb.chiark.greenend.org.uk/pctb",
+ o_serv_dict_fetch, o_flags & ff_dict_fetch);
+
+ set_server("YPPSC_PCTB_DICT_SUBMIT",
+ "http://", "dictup.pctb.chiark.greenend.org.uk",
+ o_serv_dict_submit, o_flags & ff_dict_submit);
+
+ if (!o_screenshot_fn)
+ o_screenshot_fn= masprintf("%s/#pages#.ppm",get_vardir());
+
+ /* Actually do the work */
+
if (o_mode & mf_findwindow) {
screenshot_startup();
find_yppclient_window();
}
if (o_mode & mf_screenshot) {
open_screenshot_file("w");
- if (o_single_page) take_one_screenshot();
+ if (o_flags & ff_singlepage) take_one_screenshot();
else take_screenshots();
}
if (o_mode & mf_readscreenshot) {
open_screenshot_file("r");
- if (o_single_page) read_one_screenshot();
+ if (o_flags & ff_singlepage) read_one_screenshot();
else read_screenshots();
}
if (o_mode & mf_analyse) {
+ find_islandname();
if (o_outputmode)
run_analysis();
else
_exit(16);
}
-void *mmalloc(size_t sz) {
- void *r;
- if (!sz) return 0;
- sysassert( r= malloc(sz) );
- return r;
-}
-void *mrealloc(void *p, size_t sz) {
- assert(sz);
- void *r;
- sysassert( r= realloc(p,sz) );
- return r;
-}
-
void waitpid_check_exitstatus(pid_t pid, const char *what) {
pid_t got;
int st;
fatal("%s gave strange wait status %d", what, st);
}
}
+
+char *masprintf(const char *fmt, ...) {
+ char *r;
+ va_list al;
+ va_start(al,fmt);
+ sysassert( vasprintf(&r,fmt,al) >= 0);
+ sysassert(r);
+ va_end(al);
+ return r;
+}
~yarrgweb / ypp-sc-tools.db-live.git / blobdiff