From b665472217ec8e811ffa949119eba2fe636163b0 Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on ChromeOS)" <rob@synchro.net> Date: Tue, 7 Jan 2025 23:32:25 -0800 Subject: [PATCH] FILE_ @-code changes/additions New: - FILE_COST, file's credit value or "FREE" when applicable (see also FILE_CREDITS - the file's credit value or 0 when free download) - FILE_AUTHOR - file's author (e.g. from SAUCE record) or blank if N/A - FILE_GROUP - file's author group (e.g. from SAUCE record) or blank if N/A - FILE_BYTES - file's size in bytes (previously, would use FILE_SIZE for this) - FILE_CRC32 - 8 hex digits or blank if N/A - FILE_MD5 - 32 hex digits or blank if N/A - FILE_SHA1 - 40 hex digits or blank if N/A - FILE_TIME_TO_DL - estimated time ("HH:MM:SS") to download file at current CPS Changed: FILE_SIZE is now the file size estimated in KB, MB, GB, etc., not the exact file size in bytes. --- src/sbbs3/atcodes.cpp | 51 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/src/sbbs3/atcodes.cpp b/src/sbbs3/atcodes.cpp index 8c13f7ce3e..7c06bde224 100644 --- a/src/sbbs3/atcodes.cpp +++ b/src/sbbs3/atcodes.cpp @@ -2283,23 +2283,64 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, safe_snprintf(str, maxlen, "%s%s", p, getfilevpath(&cfg, current_file, tmp, sizeof tmp)); return str; } + if(strcmp(sp, "FILE_COST") == 0) { + strlcpy(str, (cfg.dir[current_file->dir]->misc & DIR_FREE) + || (current_file->size > 0 && current_file->cost <= 0) + ? text[FREE] : u64toac(current_file->cost,tmp), maxlen); + return str; + } } if(strcmp(sp, "FILE_NAME") == 0) return current_file->name; if(strcmp(sp, "FILE_DESC") == 0) return current_file->desc; if(strcmp(sp, "FILE_TAGS") == 0) - return current_file->tags; + return current_file->tags == nullptr ? nulstr : current_file->tags; + if(strcmp(sp, "FILE_AUTHOR") == 0) + return current_file->author == nullptr ? nulstr : current_file->author; + if(strcmp(sp, "FILE_GROUP") == 0) + return current_file->author_org == nullptr ? nulstr : current_file->author_org; if(strcmp(sp, "FILE_UPLOADER") == 0) - return current_file->from; - if(strcmp(sp, "FILE_SIZE") == 0) { + return (current_file->hdr.attr & MSG_ANONYMOUS) ? text[UNKNOWN_USER] + : (current_file->from == nullptr ? nulstr : current_file->from); + if(strcmp(sp, "FILE_BYTES") == 0) { safe_snprintf(str, maxlen, "%ld", (long)current_file->size); return str; } + if(strcmp(sp, "FILE_SIZE") == 0) + return byte_estimate_to_str(current_file->size, str, sizeof str, /* units: */1024, /* precision: */1); if(strcmp(sp, "FILE_CREDITS") == 0) { safe_snprintf(str, maxlen, "%" PRIu64, current_file->cost); return str; } + if(strcmp(sp, "FILE_CRC32") == 0) { + if((current_file->file_idx.hash.flags & SMB_HASH_CRC32) + && getfilesize(&cfg, current_file) > 0 + && (uint64_t)current_file->size == smb_getfilesize(¤t_file->idx)) { + snprintf(str, maxlen, "%08x", current_file->file_idx.hash.data.crc32); + return str; + } + return nulstr; + } + if(strcmp(sp, "FILE_MD5") == 0) { + if((current_file->file_idx.hash.flags & SMB_HASH_MD5) + && getfilesize(&cfg, current_file) > 0 + && (uint64_t)current_file->size == smb_getfilesize(¤t_file->idx)) { + strlcpy(str, MD5_hex(tmp, current_file->file_idx.hash.data.md5), maxlen); + return str; + } + return nulstr; + } + if(strcmp(sp, "FILE_SHA1") == 0) { + if((current_file->file_idx.hash.flags & SMB_HASH_SHA1) + && getfilesize(&cfg, current_file) > 0 + && (uint64_t)current_file->size == smb_getfilesize(¤t_file->idx)) { + strlcpy(str, SHA1_hex(tmp, current_file->file_idx.hash.data.sha1), maxlen); + return str; + } + return nulstr; + } + if(strcmp(sp, "FILE_TIME") == 0) return timestr(current_file->time); if(strcmp(sp, "FILE_TIME_ULED") == 0) @@ -2317,6 +2358,10 @@ const char* sbbs_t::atcode(const char* sp, char* str, size_t maxlen, int* pmode, safe_snprintf(str, maxlen, "%lu", (ulong)current_file->hdr.times_downloaded); return str; } + if(strcmp(sp, "FILE_TIME_TO_DL") == 0) { + safe_snprintf(str, maxlen, "%s", sectostr(gettimetodl(&cfg, current_file, cur_cps), tmp)); + return str; + } } return get_text(sp); -- GitLab