-
Notifications
You must be signed in to change notification settings - Fork 14
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
Support the ignore of config collections #17
Open
jnpwebdeveloper
wants to merge
2
commits into
previousnext:8.x-1.x
Choose a base branch
from
jnpwebdeveloper:8.x-1.x
base: 8.x-1.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,6 +74,7 @@ function drush_drush_cmi_tools_config_export_plus($destination = NULL) { | |
return drush_log(dt('You must provide a --destination option'), LogLevel::ERROR); | ||
} | ||
$patterns = []; | ||
$collections = []; | ||
if ($ignore_list = drush_get_option('ignore-list')) { | ||
if (!is_file($ignore_list)) { | ||
return drush_log(dt('The file specified in --ignore-list option does not exist.'), LogLevel::ERROR); | ||
|
@@ -87,24 +88,40 @@ function drush_drush_cmi_tools_config_export_plus($destination = NULL) { | |
catch (InvalidDataTypeException $e) { | ||
$ignore_list_error = TRUE; | ||
} | ||
if (!isset($parsed['ignore']) || !is_array($parsed['ignore'])) { | ||
if (!isset($parsed['ignore']) || !is_array($parsed['ignore']) || !isset($parsed['ignore_collection']) || !is_array($parsed['ignore_collection'])) { | ||
$ignore_list_error = TRUE; | ||
} | ||
if ($ignore_list_error) { | ||
return drush_log(dt('The file specified in --ignore-list option is in the wrong format. It must be valid YAML with a top-level ignore key.'), LogLevel::ERROR); | ||
return drush_log(dt('The file specified in --ignore-list option is in the wrong format. It must be valid YAML with a top-level ignore and ignore_collection key.'), LogLevel::ERROR); | ||
} | ||
foreach ($parsed['ignore'] as $ignore) { | ||
// Allow for accidental .yml extension. | ||
if (substr($ignore, -4) === '.yml') { | ||
$ignore = substr($ignore, 0, -4); | ||
} | ||
$patterns[] = '/^' . str_replace('\*', '(.*)', preg_quote($ignore)) . '\.yml/'; | ||
$patterns[] = '/^' . str_replace('\*', '(.*)', preg_quote($ignore)) . '\.yml/'; | ||
} | ||
foreach ($parsed['ignore_collection'] as $ignore) { | ||
$collections[] = str_replace('.', '/', $ignore); | ||
} | ||
} | ||
} | ||
|
||
$result = _drush_config_export($destination, $destination_dir, FALSE); | ||
$file_service = \Drupal::service('file_system'); | ||
foreach ($collections as $collection_dir) { | ||
$collection_path = $destination_dir . '/' . $collection_dir; | ||
if (is_dir($collection_path)) { | ||
file_unmanaged_delete_recursive($collection_path); | ||
drush_log("Removed $collection_path collection according to ignore list.", LogLevel::OK); | ||
} | ||
$collection_directories = explode('/', $collection_dir); | ||
$collection_root_dir = $destination_dir . '/' . reset($collection_directories); | ||
if (is_dir($collection_root_dir) && (count(scandir($collection_root_dir)) == 2)) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we add a comment here about what this is doing? The 2 seems magical. Can we use |
||
file_unmanaged_delete_recursive($collection_root_dir); | ||
} | ||
} | ||
|
||
$file_service = \Drupal::service('file_system'); | ||
foreach ($patterns as $pattern) { | ||
foreach (file_scan_directory($destination_dir, $pattern) as $file_url => $file) { | ||
$file_service->unlink($file_url); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a hard break - can we make existing config-ignore.yml files that don't have the ignore_collection key continue to work?
e.g. we could