diff options
author | Florrie <towerofnix@gmail.com> | 2017-10-25 09:26:53 -0300 |
---|---|---|
committer | Florrie <towerofnix@gmail.com> | 2017-10-25 09:26:53 -0300 |
commit | aac119f2162dc981fa4b6fcba5e8301e7625a011 (patch) | |
tree | 4b22a887349b3cffdf4a6d40439996c37f8716fb /src | |
parent | e447c564e9823a32c25aa1c9309c9b13d5225933 (diff) |
Make -k and -x fail when the passed group path is not perfectly found
Diffstat (limited to 'src')
-rwxr-xr-x | src/play.js | 5 | ||||
-rw-r--r-- | src/playlist-utils.js | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/play.js b/src/play.js index 8f52e63..c754836 100755 --- a/src/play.js +++ b/src/play.js @@ -302,7 +302,10 @@ async function main(args) { const pathString = util.nextArg() const group = filterPlaylistByPathString(sourcePlaylist, pathString) - activePlaylist.items.push(group) + + if (group) { + activePlaylist.items.push(group) + } }, 'k': util => util.alias('-keep'), diff --git a/src/playlist-utils.js b/src/playlist-utils.js index a75008a..d19c571 100644 --- a/src/playlist-utils.js +++ b/src/playlist-utils.js @@ -261,7 +261,7 @@ function filterGrouplikeByPath(grouplike, pathParts) { } } else { console.warn(`Not found: "${pathParts[0]}"`) - return grouplike + return null } } @@ -276,6 +276,10 @@ function removeGroupByPath(playlist, pathParts) { const groupToRemove = filterGrouplikeByPath(playlist, pathParts) + if (groupToRemove === null) { + return + } + if (playlist === groupToRemove) { console.error( 'You can\'t remove the playlist from itself! Instead, try --clear' + |