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

Merge --layout and --layout-path #1426

Merged
merged 3 commits into from
May 28, 2022

Conversation

SpyrosRoum
Copy link
Contributor

@SpyrosRoum SpyrosRoum commented May 21, 2022

closes #1412

A layout is considered local if:
layout.extension().is_some() || layout.components().count() > 1

This check produces the following results:
"foo": Abs
"foo.yml": Local
"./foo": Local
"foo/bar": Local
"foo/bar.yml": Local

TODO:

  • Fix tests

EDIT by @imsnif

For quick reference, after this change:
--layout strider loads the strider.yaml layout from the configured layouts folder (by default config/layouts)
--layout ./relative/path.yaml or --layout /absolute/path.yaml will load the layout file

@SpyrosRoum SpyrosRoum marked this pull request as draft May 21, 2022 15:19
@imsnif
Copy link
Member

imsnif commented May 23, 2022

Hey @SpyrosRoum - cool that you're picking this up! Please reach out if you have any questions or concerns.

@SpyrosRoum
Copy link
Contributor Author

Thank you @imsnif, basic implementation is done without issues, I just need to update the e2e test as soon as I find time (hopefully today)!

@SpyrosRoum SpyrosRoum marked this pull request as ready for review May 25, 2022 15:59
Copy link
Member

@imsnif imsnif left a comment

Choose a reason for hiding this comment

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

Cool work on this! I hope you didn't mind I reworded the help text a little. Hope to see more contributions from you.

// We look in the default dir
LayoutFromYamlIntermediate::from_dir(layout, layout_dir.as_ref())
}
})
Copy link
Member

Choose a reason for hiding this comment

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

Great comments, thanks!

@imsnif imsnif merged commit 2f58835 into zellij-org:main May 28, 2022
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.

Consider merging --layout and --layout-path
2 participants