Skip to content

Commit

Permalink
Merge pull request #1749 from milaboratory/track-fasta-progress
Browse files Browse the repository at this point in the history
align could track the progress of gz input
  • Loading branch information
gnefedev authored Aug 14, 2024
2 parents b7ea937 + 507979b commit 80774d1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ val obfuscationLibs: Configuration by configurations.creating

val mixcrAlgoVersion = "4.7.0"
// may be blank (will be inherited from mixcr-algo)
val milibVersion = ""
val milibVersion = "3.5.0-1-add-progress-to-fasta"
// may be blank (will be inherited from mixcr-algo or milib)
val miuVersion = ""
// may be blank (will be inherited from mixcr-algo)
Expand Down
3 changes: 3 additions & 0 deletions changelogs/v4.7.1.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## 🛠️ Other improvements & fixes

- Tracking the progres of fasta[.gz] inputs on `align`.
Empty file removed changelogs/v4.8.0.md
Empty file.
3 changes: 1 addition & 2 deletions src/main/kotlin/com/milaboratory/mixcr/cli/CommandAlign.kt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ import com.milaboratory.util.SmartProgressReporter
import com.milaboratory.util.TempFileManager
import com.milaboratory.util.limit
import com.milaboratory.util.parseAndRunAndCorrelateFSPattern
import com.milaboratory.util.unzippedInputStream
import com.milaboratory.util.use
import com.milaboratory.util.withExpectedSize
import io.repseq.core.Chains
Expand Down Expand Up @@ -1061,7 +1060,7 @@ object CommandAlign {
throw ValidationException("File concatenation not supported for fasta files.")
val inputFile = inputFileGroups.fileGroups.first().files.first()
FastaSequenceReaderWrapper(
FastaReader(inputFile.unzippedInputStream(), NucleotideSequence.ALPHABET),
FastaReader(inputFile.toFile(), NucleotideSequence.ALPHABET),
cmdParams.replaceWildcards
).map { ProcessingBundle.fromRead(it, it.weight()) }
}
Expand Down

0 comments on commit 80774d1

Please sign in to comment.