import: prompt to allow pushing without build (#56)

juhp · Dec 13, 2024 · 146a9b6 · 146a9b6
1 parent 3b505cc
commit 146a9b6
Showing 1 changed file with 24 additions and 6 deletions.
diff --git a/src/Cmd/Import.hs b/src/Cmd/Import.hs
@@ -12,7 +12,8 @@ import Common.System
 import qualified Common.Text as T
 
 import Network.URI
-import SimplePrompt (promptEnter, yesNoDefault)
+import SimplePrompt (promptEnter)
+import SimplePrompt.Internal (runPrompt, mapInput, getPromptLine)
 
 import Branches
 import Bugzilla
@@ -59,12 +60,14 @@ importCmd existingrepo mock (breq, ps) = do
         fedpkg_ "import" [srpmfile]
         git_ "commit" ["--message", "Import rhbz#" ++ show bid]
         nvr <- pkgNameVerRel' Rawhide (pkg <.> "spec")
-        ok <- yesNoDefault True $ "Push and build" +-+ showNVR nvr
-        when ok $ do
+        mbuild <- promptPushBuild $ "Press Enter to Push & B[uild]" +-+ showNVR nvr ++ ", or just P[ush], or N[o] to skip? [Y/n/b/p]"
+        when (mbuild /= Just False) $ do
           gitPush True Nothing
-          -- FIXME build more branches
-          kojiBuildBranch "rawhide" (Package pkg) Nothing ["--fail-fast"]
-          putBugBuild False session bid nvr
+          when (mbuild == Just True) $ do
+            -- FIXME check package exists in koji (for instant import)
+            -- FIXME build more branches
+            kojiBuildBranch "rawhide" (Package pkg) Nothing ["--fail-fast"]
+            putBugBuild False session bid nvr
         existing <- fedoraBranchesNoRawhide (localBranches False)
         when (null existing) $ do
           brs <- getRequestedBranches [] breq
@@ -73,6 +76,21 @@ importCmd existingrepo mock (breq, ps) = do
       when (pkg /= takeFileName dir) $
         setCurrentDirectory dir
 
+    promptPushBuild = runPrompt . mapInput maybePush . getPromptLine
+      where
+        maybePush inp =
+          case lower inp of
+            "" -> Just (Just True)
+            "y" -> Just (Just True)
+            "yes" -> Just (Just True)
+            "b" -> Just (Just True)
+            "build" -> Just (Just True)
+            "p" -> Just Nothing
+            "push" -> Just Nothing
+            "n" -> Just (Just False)
+            "no" -> Just (Just False)
+            _ -> Nothing
+
 downloadReviewSRPM :: Bool -> Bool -> String -> Int -> BugzillaSession
                    -> IO FilePath
 downloadReviewSRPM getspec prompt pkg bid session = do