Skip to content

Refactor: Update cabal config for module rename (NewCommandLineParser → CommandLineParser) #93

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.

Sign up for GitHub

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

Merged
diskshima merged 3 commits into from
Oct 11, 2025
Merged

Refactor: Update cabal config for module rename (NewCommandLineParser → CommandLineParser) #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e209233
Refactor: Rename NewCommandLineParser to CommandLineParser in cabal c…
diskshima Oct 11, 2025
c313b0f
Refactor: Clean up code after optparse-applicative migration (#94)
diskshima Oct 11, 2025
35ef5f3
Update changelog for version 0.9.8.0
diskshima Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

## Unreleased changes

## 0.9.8.0 -- 2025-10-11

* Refactored module naming: renamed NewCommandLineParser to CommandLineParser (#94)
* Removed old GetOpt-based command-line parser
* Code cleanup and formatting improvements in Main.hs
* Improved code maintainability after optparse-applicative migration

## 0.9.7.0 -- 2025-01-27

* Migrated command-line parsing to optparse-applicative with shell completions (#90)
Expand Down
160 changes: 63 additions & 97 deletions app/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,15 @@

module Main where

-- New Parser Imports
import NewCommandLineParser (CliArguments (..), Command (..),
GlobalOptions (..), AuthOptions (..),
BrowseOptionsCli (..), IssueCommand (..),
IssueListOptionsCli (..),
import CommandLineParser (AuthOptions (..), BrowseOptionsCli (..),
CliArguments (..), Command (..),
GlobalOptions (..), IssueCommand (..),
IssueCreateOptionsCli (..),
IssueShowOptions (..),
PullRequestCommand (..),
PullRequestListOptionsCli (..),
IssueListOptionsCli (..),
IssueShowOptions (..), PullRequestCommand (..),
PullRequestCreateOptionsCli (..),
PullRequestShowOptions (..),
parseCliArgs)
-- Used by existing logic, keep for now
PullRequestListOptionsCli (..),
PullRequestShowOptions (..), parseCliArgs)
import CredentialUtils (Credentials (..), credFilePath,
readCredential, writeCredential)
import Data.List (isInfixOf, isPrefixOf)
Expand All @@ -33,18 +29,17 @@ import Remote (authenticate, createIssue,
readPRTemplate)
import RemoteTypes (Remote (..))
import qualified RemoteTypes as R
-- import System.Console.GetOpt (ArgOrder (RequireOrder), getOpt) -- Removed
import System.Directory (removeFile)
-- import System.Environment (getArgs) -- Removed, parseCliArgs handles this

import qualified Types.Issue as I
import qualified Types.PullRequest as PR
import WebUtils as WU

-- Placeholder for old IssueCreateOptions type, will be replaced by IssueCreateOptionsCli
-- This is needed because issueFromEditor still returns the old type.
-- We will refactor issueFromEditor later.
data IssueCreateOptions = IssueCreateOptions { iscoTitle :: String, iscoBody :: String, iscoShowHelp :: Bool }
data IssueCreateOptions = IssueCreateOptions
{ iscoTitle :: String
, iscoBody :: String
, iscoShowHelp :: Bool
}

issueFromEditor :: String -> IO IssueCreateOptions
issueFromEditor template = do
Expand All @@ -60,151 +55,122 @@ candidateBaseBranches = ["develop", "main", "master"]
printError :: String -> IO ()
printError = ioError . userError




paramsToIssue :: IssueCreateOptionsCli -> I.Issue
paramsToIssue params = I.Issue Nothing (icoTitle params) (Just (icoBody params)) Nothing

paramsToPullRequest :: PullRequestCreateOptionsCli -> IO PR.PullRequest
paramsToPullRequest opts = do
maybeBranch <- getCurrentBranch
case maybeBranch of
Just src -> return $ PR.PullRequest Nothing (prcoTitle opts) src (prcoBase opts) (Just (prcoBody opts)) Nothing
Nothing -> error "Failed to retrieve source branch."
maybeBranch <- getCurrentBranch
case maybeBranch of
Just src -> return $ PR.PullRequest Nothing (prcoTitle opts) src (prcoBase opts) (Just (prcoBody opts)) Nothing
Nothing -> error "Failed to retrieve source branch."

-- TODO: Refactor all handle* functions
-- The old handleIssue function, to be refactored or replaced
handleIssue :: Bool -> Remote -> IssueCommand -> IO ()
handleIssue _verbose remote issueCmd = case issueCmd of
IssueList opts -> do
issues <- listIssues remote (iloAll opts)
putStrLn $ formatEachAndJoin issues I.formatIssue
IssueCreate opts -> do
-- For now, assume icoTitle and icoBody are provided.
-- Logic for issueFromEditor will be integrated later if needed.
let newIssue = paramsToIssue opts
response <- createIssue remote newIssue
putStrLn $ I.formatIssue response
IssueShow opts -> do
IssueShow opts ->
getIssue remote (isoIssueNumber opts) >>= (putStrLn . I.formatIssue)

-- The old handlePullRequest function, to be refactored or replaced
handlePullRequest :: Bool -> Remote -> PullRequestCommand -> IO ()
handlePullRequest _verbose remote prCmd = case prCmd of
PullRequestList opts -> do
prs <- listPullRequests remote (prloAll opts)
putStrLn $ formatEachAndJoin prs PR.formatPullRequest
PullRequestCreate opts -> do
-- Logic for populateMissingPrco and paramsToPullRequest needs to be integrated
-- For now, directly use provided options.
-- prco <- populateMissingPrco opts remote -- This needs to be adapted
pr <- paramsToPullRequest opts -- This needs to be adapted
pr <- paramsToPullRequest opts
response <- createPullRequest remote pr
putStrLn $ PR.formatPullRequest response
PullRequestShow opts -> do
PullRequestShow opts ->
getPullRequest remote (prsoPrNumber opts) >>= (putStrLn . PR.formatPullRequest)


-- Old populateMissingPrco, needs to be adapted or its logic moved
populateMissingPrco :: PullRequestCreateOptionsCli -> Remote -> IO PullRequestCreateOptionsCli
populateMissingPrco PullRequestCreateOptionsCli{ prcoBase=base, prcoTitle=title, prcoBody=body } remote = do
newBase <- determineBaseBranch remote base
R.Message{ R.title=newTitle, R.body=newBody } <- determinePRBody remote title body
return $ PullRequestCreateOptionsCli { prcoBase=newBase, prcoTitle=newTitle, prcoBody=newBody }
populateMissingPrco PullRequestCreateOptionsCli{prcoBase=base, prcoTitle=title, prcoBody=body} remote = do
newBase <- determineBaseBranch remote base
R.Message{R.title=newTitle, R.body=newBody} <- determinePRBody remote title body
return $ PullRequestCreateOptionsCli {prcoBase=newBase, prcoTitle=newTitle, prcoBody=newBody}

-- Old determineBaseBranch, seems okay for now
determineBaseBranch :: Remote -> String -> IO Branch
determineBaseBranch remote "" = do
remoteBase <- defaultBranch remote
case remoteBase of
Just base -> return base
Nothing -> do
remoteBranches <- listRemoteBranches
return $ fromMaybe "master" (firstMatching remoteBranches candidateBaseBranches)
remoteBase <- defaultBranch remote
case remoteBase of
Just base -> return base
Nothing -> do
remoteBranches <- listRemoteBranches
return $ fromMaybe "master" (firstMatching remoteBranches candidateBaseBranches)
determineBaseBranch _ specifiedBranch = return specifiedBranch

-- Old determinePRBody, seems okay for now
determinePRBody :: Remote -> String -> String -> IO R.Message
determinePRBody remote "" body = do
newBody <- case body of
"" -> readPRTemplate remote
b -> return b
fp <- openEditorWithTempFile (addEmptyTitle newBody)
content <- readFile fp
removeFile fp
return $ parseMessage content
newBody <- case body of
"" -> readPRTemplate remote
b -> return b
fp <- openEditorWithTempFile (addEmptyTitle newBody)
content <- readFile fp
removeFile fp
return $ parseMessage content
determinePRBody _ title body = return $ R.Message title body

-- Old addEmptyTitle, seems okay
addEmptyTitle :: String -> String
addEmptyTitle = (++) "\n\n"

-- Refactored handleAuth
handleAuth :: Bool -> Credentials -> FilePath -> Remote -> AuthOptions -> IO ()
handleAuth _verbose creds credFP remote _authOpts = do -- _authOpts is empty for now
handleAuth _verbose creds credFP remote _authOpts = do
tokens <- authenticate remote
putStrLn "Fetched access token."
let newCreds = Credentials { github = github creds, bitbucket = tokens }
let newCreds = Credentials {github = github creds, bitbucket = tokens}
writeCredential credFP newCreds

-- Old remoteUrlToRemote, seems okay
remoteUrlToRemote :: String -> Credentials -> Remote
remoteUrlToRemote url cred
| "bitbucket" `isInfixOf` url = Bitbucket (WU.accessToken . bitbucket $ cred)
| "github.com" `isInfixOf` url = GitHub (github cred)
| otherwise = error "Could not determine remote URL"
| "bitbucket" `isInfixOf` url = Bitbucket (WU.accessToken . bitbucket $ cred)
| "github.com" `isInfixOf` url = GitHub (github cred)
| otherwise = error "Could not determine remote URL"

-- Old chooseRemote, seems okay
chooseRemote :: Credentials -> IO Remote
chooseRemote c = do
remoteUrl <- getRemoteUrl
case remoteUrl of
Nothing -> error "Could not determine remote URL."
Just url -> return $ remoteUrlToRemote url c
remoteUrl <- getRemoteUrl
case remoteUrl of
Nothing -> error "Could not determine remote URL."
Just url -> return $ remoteUrlToRemote url c

-- Old isPullRequestSubCommand, seems okay for now if used by refactored handlers
isPullRequestSubCommand :: String -> Bool
isPullRequestSubCommand cmd = isPrefixOf "pullrequest" cmd || cmd == "pr"

-- Refactored handleBrowse
handleBrowse :: Bool -> Remote -> BrowseOptionsCli -> IO ()
handleBrowse _verbose remote browseOpts =
open remote (boUrl browseOpts) (not (boPrint browseOpts)) -- Assuming open takes a boolean for 'open in browser'
open remote (boUrl browseOpts) (not (boPrint browseOpts))

-- Refactored handleShowVersion
-- The actual version string is now handled by optparse-applicative's --version flag.
-- This function is called if `gwcli version` subcommand is used.
handleShowVersion :: IO ()
handleShowVersion = putStrLn ("gwcli " ++ showVersion version) -- Or use a constant from NewCommandLineParser if desired
handleShowVersion = putStrLn ("gwcli " ++ showVersion version)

-- Placeholder for globalOptionsToVerboseOpt
globalOptionsToVerboseOpt :: GlobalOptions -> Bool
globalOptionsToVerboseOpt = optVerbose

-- New dispatch function
executeCommand :: CliArguments -> Credentials -> FilePath -> Remote -> IO ()
executeCommand (CliArguments globalOpts cmd) creds credFP remote =
case cmd of
AuthCmd authOpts -> handleAuth (globalOptionsToVerboseOpt globalOpts) creds credFP remote authOpts
BrowseCmd browseOpts -> handleBrowse (globalOptionsToVerboseOpt globalOpts) remote browseOpts
IssueCmd issueCmd -> handleIssue (globalOptionsToVerboseOpt globalOpts) remote issueCmd
PullRequestCmd prCmd -> handlePullRequest (globalOptionsToVerboseOpt globalOpts) remote prCmd
VersionCmd _ -> handleShowVersion -- Version is also handled by --version global flag
AuthCmd authOpts -> handleAuth (globalOptionsToVerboseOpt globalOpts) creds credFP remote authOpts
BrowseCmd browseOpts -> handleBrowse (globalOptionsToVerboseOpt globalOpts) remote browseOpts
IssueCmd issueCmd -> handleIssue (globalOptionsToVerboseOpt globalOpts) remote issueCmd
PullRequestCmd prCmd -> handlePullRequest (globalOptionsToVerboseOpt globalOpts) remote prCmd
VersionCmd _ -> handleShowVersion

main :: IO ()
main = do
let versionStr = "gwcli " ++ showVersion version
parsedArgs <- parseCliArgs versionStr -- New parser call

-- Credential loading (after parsing, before command execution)
credFP <- credFilePath
cred <- readCredential credFP
case cred of
Nothing -> printError "Failed to read credentials file. Please run 'gwcli auth' or check your .gwcli.yaml."
Just c -> do
remote <- chooseRemote c
-- Call the new dispatch function
executeCommand parsedArgs c credFP remote

-- Old functions like handleHelp, dispatchSubcommand, isGlobalHelp, and main's old parsing logic are removed.
let versionStr = "gwcli " ++ showVersion version
parsedArgs <- parseCliArgs versionStr

credFP <- credFilePath
cred <- readCredential credFP
case cred of
Nothing -> printError "Failed to read credentials file. Please run 'gwcli auth' or check your .gwcli.yaml."
Just c -> do
remote <- chooseRemote c
executeCommand parsedArgs c credFP remote

Loading