sidinfo: sidinfo.c comparison

comparison sidinfo.c @ 89:d9cb7c635e7b

Implement initial SLDB support.

author	Matti Hamalainen <ccr@tnsp.org>
date	Fri, 12 Feb 2016 01:17:52 +0200
parents	1e89b757f8a1
children	2ab9ab4b59eb

comparison

equal deleted inserted replaced

-:c5ff71d64e53
+:d9cb7c635e7b
 * Written by Matti 'ccr' Hämäläinen <ccr@tnsp.org>
 * (C) Copyright 2014-2016 Tecnic Software productions (TNSP)
 */
 #include "th_args.h"
 #include "th_string.h"
+#include "th_file.h"
 #include "sidlib.h"
 // Some constants
+#define SET_SLDB_FILENAME "Songlengths.txt"
 // Flags for various information fields
 enum
 {
 SIF_SID_COPYRIGHT  = 0x00000800,
 SIF_PLAYER_TYPE    = 0x00001000,
 SIF_PLAYSID_TUNE   = 0x00002000,
 SIF_VIDEO_CLOCK    = 0x00004000,
 SIF_SID_MODEL      = 0x00008000,
+SIF_SONGLENGTHS    = 0x00010000,
 SIF_DATA_SIZE      = 0x00100000,
 SIF_HASH           = 0x00200000,
 SIF_FILENAME       = 0x01000000,
 { SIF_SID_NAME       , "Name"       , NULL },
 { SIF_SID_AUTHOR     , "Author"     , NULL },
 { SIF_SID_COPYRIGHT  , "Copyright"  , NULL },
 { SIF_HASH           , "Hash"       , NULL },
+{ SIF_SONGLENGTHS    , "Songlengths", "Song lengths" },
 { SIF_ALL            , "All"        , NULL },
 };
 static const int noptPSFlags = sizeof(optPSFlags) / sizeof(optPSFlags[0]);
 // Option variables
+char   *setHVSCPath = NULL,
+*setSLDBPath = NULL;
 BOOL	optParsable = FALSE,
 optNoNamePrefix = FALSE,
 optHexadecimal = FALSE,
 optOneLine = FALSE;
 char    *optFieldSep = NULL;
 uint32_t optFields = SIF_ALL;
 int     optNFiles = 0;
 PSFStack optFormat;
+SIDLibSLDB *sidSLDB = NULL;
 // Define option arguments
 static const th_optarg_t optList[] =
 {
 { 5, 'n', "noprefix",   "Output without field name prefix", OPT_NONE },
 { 6, 'l', "line",       "Output in one line format, -l <field separator>", OPT_ARGREQ },
 { 3, 'f', "fields",     "Show only specified field(s)", OPT_ARGREQ },
 { 4, 'x', "hex",        "Use hexadecimal values", OPT_NONE },
 { 7, 'F', "format",     "Use given format string (see below)", OPT_ARGREQ },
+{ 8, 'H', "hvsc",       "Specify path to HVSC documents directory", OPT_ARGREQ },
+{ 9, 'S', "sldb",       "Specify Songlengths.txt file (use -H if possible)", OPT_ARGREQ },
 };
 static const int optListN = sizeof(optList) / sizeof(optList[0]);
 "Example: %s -x -p -f hash,copyright somesidfile.sid\n"
 "\n"
 "Format strings for '-F' option are composed of @fields@ that\n"
 "are expanded to their value. Also, escape sequences \\r, \\n and \\t\n"
 "can be used: -F \"hash=@hash@\\ncopy=@copyright@\\n\"\n"
+"\n"
+"When specifying HVSC path, it is preferable to use -H/--hvsc option,\n"
+"as STIL.txt and Songlengths.txt will be automatically used from there.\n"
 , th_prog_name);
 }
 int argMatchPSField(const char *field)
 case 7:
 if (!argParsePSFormatStr(&optFormat, optArg))
 return FALSE;
 break;
+case 8:
+setHVSCPath = th_strdup(optArg);
+break;
+case 9:
+setSLDBPath = th_strdup(optArg);
+break;
 default:
 THERR("Unknown option '%s'.\n", currArg);
 return FALSE;
 }
 str++;
 }
 }
-static void siPrintFieldPrefix(FILE *outFile, const char *name)
+static void siPrintFieldPrefix(FILE *outFile, const PSFOption *opt)
 {
+const char *name = (optParsable || opt->lname == NULL) ? opt->name : opt->lname;
 if (!optNoNamePrefix && !optFormat.nitems)
 fprintf(outFile, optParsable ? "%s=" : "%-20s : ", name);
 }
 if (optFormat.nitems || (optFields & opt->flag))
 {
 va_list ap;
 const char *fmt = optHexadecimal ? (xaltfmt != NULL ? xaltfmt : xfmt) : xfmt;
-siPrintFieldPrefix(outFile, (optParsable || opt->lname == NULL) ? opt->name : opt->lname);
+siPrintFieldPrefix(outFile, opt);
 va_start(ap, xaltfmt);
 vfprintf(outFile, fmt, ap);
 va_end(ap);
 siPrintFieldSeparator(outFile);
 *shown = TRUE;
 }
 }
 #define PR(xfmt, xaltfmt, ...) siPrintPSIDInfoLine(outFile, shown, xindex, xfmt, xaltfmt, __VA_ARGS__ )
 static void siPrintPSIDInformationField(FILE *outFile, const char *filename, const PSIDHeader *psid, BOOL *shown, const int xindex)
 case 17:
 {
 const PSFOption *opt = &optPSFlags[xindex];
 if (optFormat.nitems || (optFields & opt->flag))
 {
-siPrintFieldPrefix(outFile, "Hash");
+siPrintFieldPrefix(outFile, opt);
 th_md5_print(outFile, psid->hash);
 siPrintFieldSeparator(outFile);
 }
 }
 break;
+case 18:
+{
+const PSFOption *opt = &optPSFlags[xindex];
+if (optFormat.nitems || (optFields & opt->flag))
+{
+siPrintFieldPrefix(outFile, opt);
+if (psid->lengths != NULL)
+{
+int i;
+for (i = 0; i < psid->lengths->nlengths; i++)
+{
+int len = psid->lengths->lengths[i];
+fprintf(outFile, "%d:%d%s", len / 60, len % 60,
+(i < psid->lengths->nlengths - 1) ? " " : "");
+}
+}
+siPrintFieldSeparator(outFile);
+}
+}
+break;
 }
 }
 BOOL argHandleFile(char *filename)
 {
 THERR("Error reading %s\n", filename);
 goto error;
 }
+// Get songlength information, if any
+if (sidSLDB != NULL)
+psid.lengths = si_sldb_get_by_hash(sidSLDB, psid.hash);
 // Output
 if (optFormat.nitems)
 {
 for (index = 0; index < optFormat.nitems; index++)
 {
 {
 optParsable = FALSE;
 optNoNamePrefix = TRUE;
 }
+if (setHVSCPath != NULL)
+{
+if (setSLDBPath == NULL)
+setSLDBPath = th_strdup_printf("%s%c%s", setHVSCPath, TH_DIR_SEPARATOR, SET_SLDB_FILENAME);
+}
+if (setSLDBPath != NULL)
+{
+// Initialize SLDB
+int ret;
+th_ioctx *ctx = th_io_new(&th_stdio_io_ops);
+if (ctx == NULL || th_io_open(ctx, setSLDBPath, "r") != THERR_OK)
+{
+THERR("Ululu!\n");
+goto out;
+}
+if ((sidSLDB = si_sldb_new()) == NULL ||
+si_sldb_read(ctx, sidSLDB) != THERR_OK)
+{
+THERR("Error parsing SLDB.\n");
+goto out;
+}
+if ((ret = si_sldb_build_index(sidSLDB)) != THERR_OK)
+{
+THERR("Error building SLDB index: %s.\n",
+th_error_str(ret));
+goto out;
+}
+}
 // Process files
 if (!th_args_process(argc, argv, optList, optListN,
 argHandleOpt, argHandleFile, OPTH_ONLY_OTHER))
-return -2;
+goto out;
 if (optNFiles == 0)
 {
 argShowHelp();
 THERR("No filename(s) specified.\n");
 }
+out:
+th_free(setHVSCPath);
+th_free(setSLDBPath);
+th_free(setSTILPath);
+si_sldb_free(sidSLDB);
 return 0;
 }

Mercurial > hg > sidinfo

comparison sidinfo.c @ 89:d9cb7c635e7b