1 files changed, 45 insertions, 9 deletions
diff --git a/src/Command/JobId.hs b/src/Command/JobId.hs
index 9f531d6..b349ebe 100644
--- a/src/Command/JobId.hs
+++ b/src/Command/JobId.hs
@@ -2,18 +2,27 @@ module Command.JobId (
     JobIdCommand,
 ) where
 
+import Control.Monad
 import Control.Monad.IO.Class
 
+import Data.Bifunctor
 import Data.Text (Text)
 import Data.Text qualified as T
-import Data.Text.IO qualified as T
+
+import System.Console.GetOpt
 
 import Command
 import Eval
 import Job.Types
+import Output
+import Repo
+
 
+data JobIdCommand = JobIdCommand JobIdOptions JobRef
 
-data JobIdCommand = JobIdCommand JobRef
+data JobIdOptions = JobIdOptions
+    { joVerbose :: Bool
+    }
 
 instance Command JobIdCommand where
     commandName _ = "jobid"
@@ -22,18 +31,45 @@ instance Command JobIdCommand where
     type CommandArguments JobIdCommand = Text
 
     commandUsage _ = T.pack $ unlines $
-        [ "Usage: minici jobid <job ref>"
+        [ "Usage: minici jobid [<option>...] <job ref>"
+        ]
+
+    type CommandOptions JobIdCommand = JobIdOptions
+    defaultCommandOptions _ = JobIdOptions
+        { joVerbose = False
+        }
+
+    commandOptions _ =
+        [ Option [ 'v' ] [ "verbose" ]
+            (NoArg $ \opts -> opts { joVerbose = True })
+            "show detals of the ID"
         ]
 
-    commandInit _ _ = JobIdCommand . JobRef . T.splitOn "."
+    commandInit _ opts = JobIdCommand opts . parseJobRef
     commandExec = cmdJobId
 
 
 cmdJobId :: JobIdCommand -> CommandExec ()
-cmdJobId (JobIdCommand ref) = do
-    config <- getConfig
+cmdJobId (JobIdCommand JobIdOptions {..} ref) = do
     einput <- getEvalInput
-    JobId ids <- either (tfail . textEvalError) return =<<
-        liftIO (runEval (evalJobReference config ref) einput)
+    out <- getOutput
+    [ JobId ids ] <- either tfail (return . map jobId) =<<
+        return . either (Left . textEvalError) (first T.pack . jobsetJobsEither) =<<
+        liftIO (runEval (evalJobReference ref) einput)
 
-    liftIO $ T.putStrLn $ T.intercalate "." $ map textJobIdPart ids
+    outputMessage out $ textJobId $ JobId ids
+    when joVerbose $ do
+        outputMessage out ""
+        forM_ ids $ \case
+            JobIdName name -> outputMessage out $ textJobName name <> " (job name)"
+            JobIdCommit mbrepo cid -> outputMessage out $ T.concat
+                [ textCommitId cid, " (commit"
+                , maybe "" (\name -> " from ‘" <> textRepoName name <> "’ repo") mbrepo
+                , ")"
+                ]
+            JobIdTree mbrepo subtree cid -> outputMessage out $ T.concat
+                [ textTreeId cid, " (tree"
+                , maybe "" (\name -> " from ‘" <> textRepoName name <> "’ repo") mbrepo
+                , if not (null subtree) then ", subtree ‘" <> T.pack subtree <> "’" else ""
+                , ")"
+                ]