X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=pctb%2Fconvert.c;h=89115481d1488a9d929509b5a16f90296eff14e0;hb=2c6eeb55b7339bf639ab93826446ffb4390e8f78;hp=fa9837fa93e7279ce2c762ef4b816499dd486804;hpb=3d80a86a8c77e29a26e70aa810ebb2dea607208e;p=ypp-sc-tools.web-live.git diff --git a/pctb/convert.c b/pctb/convert.c index fa9837f..8911548 100644 --- a/pctb/convert.c +++ b/pctb/convert.c @@ -37,16 +37,18 @@ const char *get_libdir(void) { return "."; } enum mode { - mf_findwindow= 0001, - mf_screenshot= 0010, - mf_readscreenshot= 0020, - mf_analyse= 0100, + mf_findwindow= 00001, + mf_screenshot= 00010, + mf_readscreenshot= 00020, + mf_analyse= 00100, + mfm_special= 07000, - mode_findwindow= 0001, - mode_screenshot= 0011, - mode_analyse= 0120, + mode_findwindow= 00001, + mode_screenshot= 00011, + mode_analyse= 00120, + mode_showcharset= 01000, - mode_all= 0111, + mode_all= 00111, }; enum outmodekind { @@ -90,7 +92,7 @@ static void run_analysis(void) { analyse(tf); if (o_flags & ff_upload) { - if (o_flags & ff_singlepage) + if (npages<=1) fatal("Recognition successful, but refusing to upload partial data\n" " (--single-page specified). Specify an output mode?"); } @@ -122,6 +124,8 @@ void fetch_with_rsync(const char *stem) { const char *src= getenv("YPPSC_PCTB_DICT_UPDATE"); char *remote= masprintf("%s/master-%s.txt", src, stem); char *local= masprintf("#master-%s#.txt", stem); + if (DEBUGP(rsync)) + fprintf(stderr,"executing rsync to fetch %s to %s\n",remote,local); execlp(rsync, "rsync", DEBUGP(rsync) ? "-vLt" : "-Lt", "--",remote,local,(char*)0); @@ -132,7 +136,8 @@ void fetch_with_rsync(const char *stem) { } static void set_server(const char *envname, const char *defprotocol, - const char *defvalue, const char *userspecified, + const char *defvalue, const char *defvalue_test, + const char *userspecified, int enable) { const char *value; @@ -142,6 +147,8 @@ static void set_server(const char *envname, const char *defprotocol, value= userspecified; else if ((value= getenv(envname))) ; + else if (o_flags & ff_testservers) + value= defvalue_test; else value= defvalue; @@ -181,6 +188,7 @@ int main(int argc, char **argv) { while ((arg=*++argv)) { if (IS("--find-window-only")) o_mode= mode_findwindow; else if (IS("--screenshot-only")) o_mode= mode_screenshot; + else if (IS("--show-charset")) o_mode= mode_showcharset; else if (IS("--analyse-only") || IS("--same")) o_mode= mode_analyse; else if (IS("--everything")) o_mode= mode_all; @@ -188,6 +196,7 @@ int main(int argc, char **argv) { 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("--test-servers")) o_flags |= ff_testservers; 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; @@ -222,8 +231,14 @@ int main(int argc, char **argv) { /* Consequential changes to options */ if (o_mode & mf_analyse) { - if (!o_outmode_kind) - o_outmode_kind= (o_flags & ff_printisland) ? omk_none : omk_str; + if (!o_outmode_kind) { + if (o_flags & ff_printisland) { + o_outmode_kind= omk_none; + o_flags |= ff_singlepage; + } else { + o_outmode_kind= omk_upload; + } + } if (o_outmode_kind==omk_upload) { o_flags |= ffs_upload; @@ -234,15 +249,18 @@ int main(int argc, char **argv) { /* Defaults */ set_server("YPPSC_PCTB_PCTB", - "http://", "pctb.ilk.org", - o_serv_pctb, o_flags & (ff_needisland|ff_upload)); + "http://", "pctb.ilk.org" /*pctb.crabdance.com*/, + "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", + "rsync://", "rsync.pctb.chiark.greenend.org.uk/pctb", + "rsync.pctb.chiark.greenend.org.uk/pctb/test", o_serv_dict_fetch, o_flags & ff_dict_fetch); set_server("YPPSC_PCTB_DICT_SUBMIT", "http://", "dictup.pctb.chiark.greenend.org.uk", + "dictup.pctb.chiark.greenend.org.uk/test", o_serv_dict_submit, o_flags & ff_dict_submit); if (!o_screenshot_fn) @@ -257,30 +275,40 @@ int main(int argc, char **argv) { if (!ocean) ocean= o_ocean; if (!pirate) pirate= o_pirate; - if (o_flags & ff_needisland) { + if (o_flags & ff_needisland) if (!ocean) - badusage("need --ocean option when replaying images" + badusage("need --ocean option when not using actual YPP client window" " (consider supplying --pirate too)"); + if (ocean) sysassert(! setenv("YPPSC_OCEAN",ocean,1) ); - } if (pirate && (o_flags & ff_dict_pirate)) sysassert(! setenv("YPPSC_PIRATE",pirate,1) ); + switch (o_mode & mfm_special) { + case 0: break; + case mode_showcharset: ocr_showcharsets(); exit(0); + default: abort(); + } + if (o_mode & mf_screenshot) { 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."); } if (o_mode & mf_readscreenshot) { + if ((o_flags & ff_upload) && !(o_flags & ff_testservers)) + badusage("must not reuse screenshots for upload to live PCTB database"); open_screenshot_file("r"); if (o_flags & ff_singlepage) read_one_screenshot(); else read_screenshots(); } if (o_mode & mf_analyse) { if (o_flags & ff_needisland) { - find_islandname(); + find_islandname(page0_rgbimage); if (o_flags & ff_printisland) printf("%s, %s\n", archipelago, island); + sysassert(! setenv("YPPSC_ISLAND",island,1) ); } switch (o_outmode_kind) { case omk_upload: case omk_str: run_analysis(); break;