Skip to content

Commit

Permalink
Also convert DiscardCasava
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelm committed Jan 30, 2024
1 parent ee2ff17 commit 5a145b3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
12 changes: 11 additions & 1 deletion src/cutadapt/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
TooManyN,
TooManyExpectedErrors,
TooHighAverageErrorRate,
CasavaFiltered,
)
from cutadapt.report import full_report, minimal_report, Statistics
from cutadapt.pipeline import SingleEndPipeline, PairedEndPipeline
Expand Down Expand Up @@ -932,6 +933,16 @@ def make_pipeline_from_args( # noqa: C901
step = SingleEndFilter(predicate, None)
steps.append(step)

if args.discard_casava:
predicate = CasavaFiltered()
if paired:
step = PairedEndFilter(
predicate, predicate, writer=None, pair_filter_mode=pair_filter_mode
)
else:
step = SingleEndFilter(predicate, None)
steps.append(step)

logger.debug("Pipeline steps:")
for step in steps:
logger.debug("- %s", step)
Expand Down Expand Up @@ -1013,7 +1024,6 @@ def make_pipeline_from_args( # noqa: C901
pipeline.override_untrimmed_pair_filter = True

# Set filtering parameters
pipeline.discard_casava = args.discard_casava
pipeline.discard_trimmed = args.discard_trimmed
pipeline.discard_untrimmed = args.discard_untrimmed

Expand Down
6 changes: 0 additions & 6 deletions src/cutadapt/pipeline.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
from .predicates import (
DiscardUntrimmed,
Predicate,
CasavaFiltered,
DiscardTrimmed,
)
from .steps import (
Expand Down Expand Up @@ -61,7 +60,6 @@ def __init__(self) -> None:
self._textiowrappers: List[TextIO] = []

# Filter settings
self.discard_casava = False
self.discard_trimmed = False
self.discard_untrimmed = False

Expand Down Expand Up @@ -96,10 +94,6 @@ def _set_output(self, outfiles: OutputFiles) -> None: # noqa: C901
steps = []
files: List[Optional[BinaryIO]]

if self.discard_casava:
f1 = f2 = CasavaFiltered()
steps.append(self._make_filter(f1, f2, None))

if (
int(self.discard_trimmed)
+ int(self.discard_untrimmed)
Expand Down

0 comments on commit 5a145b3

Please sign in to comment.