From a589e61c2b807196696632eb17e8ad573daa9c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Smr=C5=BE?= Date: Fri, 11 Sep 2026 21:20:46 +0200 Subject: Use colon as preferred job ID separator Changelog: Colon `:` is now accepted and preferred as job ID separator. --- src/Command/Run.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src/Command/Run.hs') diff --git a/src/Command/Run.hs b/src/Command/Run.hs index ccd4bfa..6419c58 100644 --- a/src/Command/Run.hs +++ b/src/Command/Run.hs @@ -10,6 +10,7 @@ import Control.Monad.IO.Class import Data.Char import Data.Containers.ListUtils +import Data.Either import Data.List import Data.Maybe import Data.Text (Text) @@ -314,10 +315,14 @@ cmdRun (RunCommand RunOptions {..} args) = do ] let ( nameOptions, jobOptions ) = partition (T.all $ \c -> isAlphaNum c || c == '_') args - ( refOptions, exprOptions ) = partition (\r -> "." `T.isInfixOf` r && not (".." `T.isInfixOf` r)) jobOptions + ( refOptions, exprOptions ) = partitionEithers $ map splitRefs jobOptions + splitRefs t = case parseJobRef t of + JobRef [ e ] -> Right e + JobRef [ e, "" ] -> Right e + ref -> Left ref argumentJobs <- argumentJobSource $ map JobName nameOptions - refJobs <- refJobSource $ map parseJobRef refOptions + refJobs <- refJobSource refOptions exprJobs <- forM exprOptions $ \trange -> case parseRangeExpression trange of -- cgit v1.2.3