From 7d8344f3637d59b982c2ca0b1d8fd2889ec5d4a6 Mon Sep 17 00:00:00 2001 From: Wiimm Date: Sun, 25 Dec 2022 08:25:56 +0100 Subject: SZS v2.32a --- project/src/ui/gen-ui.c | 2 +- project/src/ui/tab-wlect.inc | 19 +++++++++++--- project/src/ui/ui-wlect.c | 60 ++++++++++++++++++++++++++++++++++++-------- project/src/ui/ui-wlect.h | 6 ++++- project/src/ui/ui.def | 59 ++++++++++++++++++++++++++++++++----------- 5 files changed, 117 insertions(+), 29 deletions(-) (limited to 'project/src/ui') diff --git a/project/src/ui/gen-ui.c b/project/src/ui/gen-ui.c index 618fdeb..4fecc1d 100644 --- a/project/src/ui/gen-ui.c +++ b/project/src/ui/gen-ui.c @@ -164,7 +164,7 @@ bool DefineIntVar ( VarMap_t * vm, ccp varname, int value ) { return false; } #define GENERIC_IMAGE(src) \ "If " src " starts with colon (@:@), then it may be a generic image" \ " instead of a real file." \ - " See https://szs.wiimm.de/doc/genericimg for details." + "\1 See https://szs.wiimm.de/doc/genericimg for details." // /////////////////////////////////////////////////////////////////////////////// diff --git a/project/src/ui/tab-wlect.inc b/project/src/ui/tab-wlect.inc index 0604c3d..42fb744 100644 --- a/project/src/ui/tab-wlect.inc +++ b/project/src/ui/tab-wlect.inc @@ -159,10 +159,15 @@ " @DIFFER@ (2) if at least one test failed, or an error code." }, { T_DEF_CMD, "PATCH", "PATCH|P", - "wlect PATCH [le_bin]...", - "Read each LE-BIN file and patch it." + "wlect PATCH [lecode_bin]...", + "Read each LE-CODE binary file and patch it." " Use {--le-define} to setup cups and tracks." }, + { H_DEF_CMD, "TIMESTAMP", "TIMESTAMP", + "wlect TIMESTAMP [lecode_bin]...", + "Read each LE-CODE binary file and set creation time if exists and is null" + " with respect to others existing timestamps." }, + { T_DEF_CMD, "LPAR", "LPAR", "wlect LPAR [le_bin]...", "Read each LE-BIN file and patch it." @@ -447,7 +452,7 @@ { T_OPT_CP, "CREATE_DISTRIB", "create-distrib|createdistrib", "file", "Create a LE-CODE distribution dump with a track list and more info about" - " the current distribution. Store the dump info a file." }, + " the current distribution. Store the dump into a file." }, #if OPT_OLD_NEW { H_OPT_GM, "OLD", "OLD", @@ -922,6 +927,14 @@ { T_COPT, "IGNORE", 0,0,0 }, { T_COPT, "CREATE_DISTRIB",0,0,0 }, + //---------- COMMAND wlect TIMESTAMP ---------- + + { T_CMD_BEG, "TIMESTAMP", 0,0,0 }, + + { T_COPY_GRP, "DEST", 0,0,0 }, +// { T_COPT, "NO_CHECK", 0,0,0 }, + { T_COPT, "IGNORE", 0,0,0 }, + //---------- COMMAND wlect LPAR ---------- { T_CMD_BEG, "LPAR", 0,0,0 }, diff --git a/project/src/ui/ui-wlect.c b/project/src/ui/ui-wlect.c index f6f0aa9..0dbdadf 100644 --- a/project/src/ui/ui-wlect.c +++ b/project/src/ui/ui-wlect.c @@ -127,7 +127,7 @@ static const InfoOption_t OptionInfo[OPT__N_TOTAL+1] = { OPT_CREATE_DISTRIB, false, false, false, false, false, 0, "create-distrib", "file", "Create a LE-CODE distribution dump with a track list and more info" - " about the current distribution. Store the dump info a file." + " about the current distribution. Store the dump into a file." }, { OPT_LE_DEFINE, false, false, false, false, true, 0, "le-define", @@ -830,6 +830,7 @@ static const KeywordTab_t CommandTab[] = { CMD_BIN_DIFF, "BIN-DIFF", "BINDIFF", 0 }, { CMD_BIN_DIFF, "BD", 0, 0 }, { CMD_PATCH, "PATCH", "P", 0 }, + { CMD_TIMESTAMP, "TIMESTAMP", 0, 0 }, { CMD_LPAR, "LPAR", 0, 0 }, { CMD_CREATE, "CREATE", "CR", 0 }, { CMD_DISTRIBUTION, "DISTRIBUTION", "DIS", 0 }, @@ -1261,37 +1262,43 @@ static u8 option_allowed_cmd_PATCH[47] = // cmd #23 0,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 }; -static u8 option_allowed_cmd_LPAR[47] = // cmd #24 +static u8 option_allowed_cmd_TIMESTAMP[47] = // cmd #24 +{ + 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, + 0,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 +}; + +static u8 option_allowed_cmd_LPAR[47] = // cmd #25 { 0,0,0,0,1, 1,1,0,0,0, 0,0,0,1,1, 1,1,1,1,1, 1,1,1,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 }; -static u8 option_allowed_cmd_CREATE[47] = // cmd #25 +static u8 option_allowed_cmd_CREATE[47] = // cmd #26 { 0,0,0,0,1, 1,1,0,1,1, 1,1,0,1,0, 1,0,1,1,1, 1,1,1,1,0, 0,0,0,0,0, 0,1,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 }; -static u8 option_allowed_cmd_DISTRIBUTION[47] = // cmd #26 +static u8 option_allowed_cmd_DISTRIBUTION[47] = // cmd #27 { 0,1,0,0,1, 1,1,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,1, 1,1,1,1,1, 0,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 }; -static u8 option_allowed_cmd_CAT[47] = // cmd #27 +static u8 option_allowed_cmd_CAT[47] = // cmd #28 { 0,0,0,0,1, 1,1,0,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0 }; -static u8 option_allowed_cmd_DECODE[47] = // cmd #28 +static u8 option_allowed_cmd_DECODE[47] = // cmd #29 { 0,0,0,0,1, 1,1,0,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 }; -static u8 option_allowed_cmd_ENCODE[47] = // cmd #29 +static u8 option_allowed_cmd_ENCODE[47] = // cmd #30 { 0,0,0,0,0, 0,0,0,1,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 1,0,0,0,0, 0,0,1,1,1, 1,1,1,1,1, 1,0 @@ -1630,6 +1637,24 @@ static const InfoOption_t * option_tab_cmd_PATCH[] = 0 }; +static const InfoOption_t * option_tab_cmd_TIMESTAMP[] = +{ + OptionInfo + OPT_DEST, + OptionInfo + OPT_DEST2, + OptionInfo + OPT_ESC, + + OptionInfo + OPT_NONE, // separator + + OptionInfo + OPT_OVERWRITE, + OptionInfo + OPT_NUMBER, + OptionInfo + OPT_REMOVE_DEST, + OptionInfo + OPT_UPDATE, + OptionInfo + OPT_PRESERVE, + OptionInfo + OPT_IGNORE, + + 0 +}; + static const InfoOption_t * option_tab_cmd_LPAR[] = { OptionInfo + OPT_LE_DEFINE, @@ -2187,15 +2212,30 @@ static const InfoCommand_t CommandInfo[CMD__N+1] = false, "PATCH", "P", - "wlect PATCH [le_bin]...", - "Read each LE-BIN file and patch it. Use --le-define to setup cups and" - " tracks.", + "wlect PATCH [lecode_bin]...", + "Read each LE-CODE binary file and patch it. Use --le-define to setup" + " cups and tracks.", 0, 25, option_tab_cmd_PATCH, option_allowed_cmd_PATCH }, + { CMD_TIMESTAMP, + true, + false, + false, + "TIMESTAMP", + 0, + "wlect TIMESTAMP [lecode_bin]...", + "Read each LE-CODE binary file and set creation time if exists and is" + " null with respect to others existing timestamps.", + 0, + 9, + option_tab_cmd_TIMESTAMP, + option_allowed_cmd_TIMESTAMP + }, + { CMD_LPAR, false, false, diff --git a/project/src/ui/ui-wlect.h b/project/src/ui/ui-wlect.h index c98d091..9be22b2 100644 --- a/project/src/ui/ui-wlect.h +++ b/project/src/ui/ui-wlect.h @@ -312,6 +312,9 @@ typedef enum enumOptions // | OB_IGNORE // | OB_CREATE_DISTRIB, // +// OB_CMD_TIMESTAMP = OB_GRP_DEST +// | OB_IGNORE, +// // OB_CMD_LPAR = OB_GRP_PATCH // | OB_GRP_DEST // | OB_GRP_TEXTOUT, @@ -384,6 +387,7 @@ typedef enum enumCommands CMD_DLLL, CMD_BIN_DIFF, CMD_PATCH, + CMD_TIMESTAMP, CMD_LPAR, CMD_CREATE, @@ -393,7 +397,7 @@ typedef enum enumCommands CMD_ENCODE, - CMD__N // == 30 + CMD__N // == 31 } enumCommands; diff --git a/project/src/ui/ui.def b/project/src/ui/ui.def index d1c5e43..a9a6634 100644 --- a/project/src/ui/ui.def +++ b/project/src/ui/ui.def @@ -14506,24 +14506,21 @@ "wimgt DECODE [source]...", \ "Decode (export) the entered image files into PNG files. The default" \ " destination is @'%P/%F.png'@. If SOURCE starts with colon (@:@)," \ - " then it may be a generic image instead of a real file. See" \ - " https://szs.wiimm.de/doc/genericimg for details." ) + " then it may be a generic image instead of a real file." ) #:def_cmd( "ENCODE", "ENCODE|ENC", \ "wimgt ENCODE [source]...", \ "Encode (import) the entered PNG files and convert them to to an" \ " internal image format (TPL, TEX, BREFT). The default destination is" \ " @'%P/%N'@ (removed extension). If SOURCE starts with colon (@:@)," \ - " then it may be a generic image instead of a real file. See" \ - " https://szs.wiimm.de/doc/genericimg for details." ) + " then it may be a generic image instead of a real file." ) #:def_cmd( "CONVERT", "CONVERT|CV", \ "wimgt CONVERT [source]...", \ "Convert the entered image files into new file and image formats. The" \ " old file is replaced by the new one. The difference to {ENCODE} is" \ " only the default file name handling. If SOURCE starts with colon" \ - " (@:@), then it may be a generic image instead of a real file. See" \ - " https://szs.wiimm.de/doc/genericimg for details." ) + " (@:@), then it may be a generic image instead of a real file." ) #:def_cmd( "COPY", "COPY|CP", \ "wimgt COPY source dest\n" \ @@ -14536,8 +14533,7 @@ " extension of the destination. Option --transform may override this." \ " Option --overwrite is set implicitly.\n" \ " If SOURCE starts with colon (@:@), then it may be a generic image" \ - " instead of a real file. See https://szs.wiimm.de/doc/genericimg for" \ - " details." ) + " instead of a real file." ) #:def_opt( "VERSION", "V|version", "G", \ "", \ @@ -14855,8 +14851,7 @@ " option is used multiple times all patch files will be used in the" \ " entered order.\n" \ " If FILE starts with colon (@:@), then it may be a generic image" \ - " instead of a real file. See https://szs.wiimm.de/doc/genericimg for" \ - " details." ) + " instead of a real file." ) #:def_opt( "TRANSFORM", "x|transform", "CP", \ "list", \ @@ -20178,9 +20173,9 @@ " least one test failed, or an error code." ) #:def_cmd( "PATCH", "PATCH|P", \ - "wlect PATCH [le_bin]...", \ - "Read each LE-BIN file and patch it. Use {--le-define} to setup cups" \ - " and tracks." ) + "wlect PATCH [lecode_bin]...", \ + "Read each LE-CODE binary file and patch it. Use {--le-define} to" \ + " setup cups and tracks." ) #:def_cmd( "LPAR", "LPAR", \ "wlect LPAR [le_bin]...", \ @@ -20500,7 +20495,7 @@ #:def_opt( "CREATE_DISTRIB", "create-distrib|createdistrib", "CP", \ "file", \ "Create a LE-CODE distribution dump with a track list and more info" \ - " about the current distribution. Store the dump info a file." ) + " about the current distribution. Store the dump into a file." ) #:def_opt( "LE_DEFINE", "le-define|ledefine", "CP", \ "file", \ @@ -21246,6 +21241,42 @@ "", \ "" ) +#:def_cmd_opt( "TIMESTAMP", "DEST", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "DEST2", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "ESC", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "OVERWRITE", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "NUMBER", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "REMOVE_DEST", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "UPDATE", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "PRESERVE", \ + "", \ + "" ) + +#:def_cmd_opt( "TIMESTAMP", "IGNORE", \ + "", \ + "" ) + #:def_cmd_opt( "LPAR", "LE_DEFINE", \ "", \ "" ) -- cgit v1.3.1