From 4774438644e59fa436b504f7de18c9eaa6ce4f3a Mon Sep 17 00:00:00 2001
From: Eric Coissac <eric@coissac.eu>
Date: Wed, 12 Feb 2025 08:40:38 +0100
Subject: [PATCH] Changes to be committed: 	modified:  
 pkg/obiformats/universal_read.go 	modified:   pkg/obioptions/version.go 
 modified:   pkg/obiseq/taxonomy_methods.go

---
 pkg/obiformats/universal_read.go | 2 +-
 pkg/obioptions/version.go        | 2 +-
 pkg/obiseq/taxonomy_methods.go   | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkg/obiformats/universal_read.go b/pkg/obiformats/universal_read.go
index 5e7d6da..2d9a9d0 100644
--- a/pkg/obiformats/universal_read.go
+++ b/pkg/obiformats/universal_read.go
@@ -72,7 +72,7 @@ func OBIMimeTypeGuesser(stream io.Reader) (*mimetype.MIME, io.Reader, error) {
 	}
 
 	fastqDetector := func(raw []byte, limit uint32) bool {
-		ok, err := regexp.Match("^@[^ ].*\n[^ ]+\n\\+", raw)
+		ok, err := regexp.Match("^@[^ ].*\n[A-Za-z.-]+", raw)
 		return ok && err == nil
 	}
 
diff --git a/pkg/obioptions/version.go b/pkg/obioptions/version.go
index c017f7d..d6c5703 100644
--- a/pkg/obioptions/version.go
+++ b/pkg/obioptions/version.go
@@ -8,7 +8,7 @@ import (
 // corresponds to the last commit, and not the one when the file will be
 // commited
 
-var _Commit = "e2563cd"
+var _Commit = "6a8061c"
 var _Version = "Release 4.2.0"
 
 // Version returns the version of the obitools package.
diff --git a/pkg/obiseq/taxonomy_methods.go b/pkg/obiseq/taxonomy_methods.go
index 1518436..3a347b4 100644
--- a/pkg/obiseq/taxonomy_methods.go
+++ b/pkg/obiseq/taxonomy_methods.go
@@ -41,13 +41,12 @@ func (s *BioSequence) SetTaxid(taxid string, rank ...string) {
 			taxon, isAlias, err = taxonomy.Taxon(taxid)
 
 			if err != nil {
+				logger := log.Warnf
 				if obidefault.FailOnTaxonomy() {
-					log.Fatalf("%s: Taxid: %v is unknown from taxonomy (%v)",
-						s.Id(), taxid, err)
-				} else {
-					log.Warnf("%s: Taxid: %v is unknown from taxonomy (%v)",
-						s.Id(), taxid, err)
+					logger = log.Fatalf
 				}
+				logger("%s: Taxid: %v is unknown from taxonomy (%v)",
+					s.Id(), taxid, err)
 			}
 
 			if isAlias {