Skip to content

Fixed inspect for tasks with duration of days #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 4, 2018
Merged

Fixed inspect for tasks with duration of days #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@
- Added removal of duplicate IDs from `reads_download` component input.
- Added seed parameter to `downsample_fastq` component.

### Bug fixes

- Fixed `inspect` issue when tasks took more than a day in duration.

## 1.3.1

### Features
Expand Down
5 changes: 4 additions & 1 deletion flowcraft/generator/inspect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,10 @@ def _hms(s):
if s.endswith("ms"):
return float(s.rstrip("ms")) / 1000

fields = list(map(float, re.split("[hms]", s)[:-1]))
fields = list(map(float, re.split("[dhms]", s)[:-1]))
if len(fields) == 4:
return fields[0] * 24 * 3600 + fields[1] * 3600 + fields[2] * 60 +\
fields[3]
if len(fields) == 3:
return fields[0] * 3600 + fields[1] * 60 + fields[2]
elif len(fields) == 2:
Expand Down