diff --git a/adaptive_compress.c b/adaptive_compress.c index 09b97db..b7f6f21 100644 --- a/adaptive_compress.c +++ b/adaptive_compress.c @@ -288,7 +288,7 @@ adapt_compress(void *src, uint64_t srclen, void *dst, } else { #ifdef ENABLE_PC_LIBBSC if (adat->bsc_data && (PC_SUBTYPE(btype) == TYPE_MARKUP || - PC_SUBTYPE(btype) == TYPE_BMP)) { + PC_SUBTYPE(btype) == TYPE_BMP || PC_SUBTYPE(btype) == TYPE_DNA_SEQ)) { rv = libbsc_compress(src, srclen, dst, dstlen, level, chdr, btype, adat->bsc_data); if (rv < 0) return (rv); diff --git a/pcompress.c b/pcompress.c index f7cb3f1..81e2fc2 100644 --- a/pcompress.c +++ b/pcompress.c @@ -2050,7 +2050,12 @@ start_compress(pc_ctx_t *pctx, const char *filename, uint64_t chunksize, int lev } add_fname(tmpfile1); } else { - snprintf(to_filename, sizeof (to_filename), "%s" COMP_EXTN, pctx->to_filename); + if (!endswith(pctx->to_filename, COMP_EXTN)) + snprintf(to_filename, sizeof (to_filename), + "%s" COMP_EXTN, pctx->to_filename); + else + snprintf(to_filename, sizeof (to_filename), + "%s", pctx->to_filename); if ((compfd = open(to_filename, O_CREAT|O_RDWR, S_IRUSR|S_IWUSR)) == -1) { log_msg(LOG_ERR, 1, "open "); COMP_BAIL; @@ -3131,8 +3136,7 @@ init_pc_context(pc_ctx_t *pctx, int argc, char *argv[]) } } else { strcpy(apath, pctx->filename); - if (!endswith(apath, COMP_EXTN)) - strcat(apath, COMP_EXTN); + strcat(apath, COMP_EXTN); pctx->to_filename = realpath(apath, NULL); /* Check if compressed file exists */ diff --git a/utils/phash/extensions.h b/utils/phash/extensions.h index 4aac8e2..e29394e 100644 --- a/utils/phash/extensions.h +++ b/utils/phash/extensions.h @@ -69,11 +69,11 @@ struct ext_entry { {"lua" , TYPE_TEXT, 3}, {"qml" , TYPE_TEXT|TYPE_MARKUP, 3}, {"fa" , TYPE_TEXT|TYPE_DNA_SEQ, 2}, - {"faa" , TYPE_TEXT, 3}, + {"faa" , TYPE_TEXT|TYPE_DNA_SEQ, 3}, {"asn" , TYPE_TEXT|TYPE_MARKUP, 3}, {"ffn" , TYPE_TEXT|TYPE_DNA_SEQ, 3}, {"fna" , TYPE_TEXT|TYPE_DNA_SEQ, 3}, - {"frn" , TYPE_TEXT, 3}, + {"frn" , TYPE_TEXT|TYPE_DNA_SEQ, 3}, {"gbk" , TYPE_TEXT, 3}, {"gff" , TYPE_TEXT, 3}, {"ptt" , TYPE_TEXT, 3}, diff --git a/utils/phash/extensions.txt b/utils/phash/extensions.txt index 5a3642a..b227fb4 100644 --- a/utils/phash/extensions.txt +++ b/utils/phash/extensions.txt @@ -58,11 +58,11 @@ qml,TYPE_TEXT|TYPE_MARKUP # These are all genomic data file extensions fa,TYPE_TEXT|TYPE_DNA_SEQ -faa,TYPE_TEXT +faa,TYPE_TEXT|TYPE_DNA_SEQ asn,TYPE_TEXT|TYPE_MARKUP ffn,TYPE_TEXT|TYPE_DNA_SEQ fna,TYPE_TEXT|TYPE_DNA_SEQ -frn,TYPE_TEXT +frn,TYPE_TEXT|TYPE_DNA_SEQ gbk,TYPE_TEXT gff,TYPE_TEXT ptt,TYPE_TEXT