Skip to content
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.

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

sam ls: fixed command results when combine -d/-s/-f options #579

Merged
merged 6 commits into from
Aug 29, 2016

Conversation

cchampet
Copy link
Member

No description provided.

if args.directories and itemType == sequenceParser.eTypeFolder:
toPrint = True
# sam-ls -f
if args.files and itemType == sequenceParser.eTypeFile:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

elif

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No because we would like to combine these options.
For example:

sam ls -df

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but this is still true in this configuration.
It can only be true for one solution, as itemType has only one value.

Copy link
Member Author

@cchampet cchampet Aug 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right: it is working because itemType has only one value.
I overwrite the corresponding commit: f508ca9

Clement Champetier added 2 commits August 19, 2016 14:09
In a folder with directories and sequences:
* Before this commit:
    * sam ls -d: only directories
    * sam ls -s: only sequences
    * sam ls -ds: nothing
* After this commit:
    * sam ls -d: only directories
    * sam ls -s: only sequences
    * sam ls -ds: both directories and sequences
It is necessary to check that only if the item will be printed.
@cchampet cchampet force-pushed the fix_samLsFilterOptions branch from d292666 to 27b6023 Compare August 19, 2016 12:09
Clement Champetier added 3 commits August 29, 2016 09:47
… fix_samLsFilterOptions

Conflicts:
	applications/sam/sam_ls.py
Instead, added a space in the details of each item.
* Instead, added a space.
* Almost the same result when displaying, and easier to parse.
@cchampet cchampet merged commit 5898e58 into tuttleofx:develop Aug 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants