yogsototh/gpm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

better dirs, files

Browse source
This commit is contained in:
Yann Esposito (Yogsototh) 2018-10-06 22:51:16 +02:00
parent ce193b5294
commit e17e88e943
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/GPM/Review.hs
View file

@ -26,6 +26,7 @@ import GPM.Helpers (getGPMCacheDir, debug_, getGitUser)
import Text.Mustache import Text.Mustache
import qualified Data.Text as Text import qualified Data.Text as Text
import qualified Data.Char as Char import qualified Data.Char as Char
import qualified System.Directory as Directory
data ReviewCommand = ReviewStart ReviewOptions data ReviewCommand = ReviewStart ReviewOptions
| ReviewCommit | ReviewCommit
@ -57,12 +58,6 @@ parseFullReviewOptions =
<$> switch "interactive" 'i' "Interactive mode" <$> switch "interactive" 'i' "Interactive mode"
<*> parseFullNewReview <*> parseFullNewReview
parsePartialReviewOptions :: Text -> Parser ReviewOptions
parsePartialReviewOptions status =
ReviewOptions
<$> switch "interactive" 'i' "Interactive mode"
<*> parsePartialNewReview status
parseFullNewReview :: Parser NewReview parseFullNewReview :: Parser NewReview
parseFullNewReview = do parseFullNewReview = do
nrStatus <- optional $ optText "status" 's' "The status of the review (TODO, QUESTION, ...)" nrStatus <- optional $ optText "status" 's' "The status of the review (TODO, QUESTION, ...)"
@ -78,6 +73,12 @@ parseFullNewReview = do
, description = nrDescription , description = nrDescription
} }
parsePartialReviewOptions :: Text -> Parser ReviewOptions
parsePartialReviewOptions status =
ReviewOptions
<$> switch "interactive" 'i' "Interactive mode"
<*> parsePartialNewReview status
parsePartialNewReview :: Text -> Parser NewReview parsePartialNewReview :: Text -> Parser NewReview
parsePartialNewReview status = do parsePartialNewReview status = do
nrTitle <- optional $ optText "title" 't' "The status title" nrTitle <- optional $ optText "title" 't' "The status title"
@ -155,8 +156,11 @@ protectStr =
validTmpNewReview :: Text -> IO () validTmpNewReview :: Text -> IO ()
validTmpNewReview br = do validTmpNewReview br = do
tmpReviewFile <- getTmpReviewFile br tmpReviewFile <- getTmpReviewFile br
tmpIssue <- readFile (toS (format fp tmpReviewFile)) tmpReview <- readFile (toS (format fp tmpReviewFile))
appendFile ("review-" <> toS (protectStr br) <> ".org") ("\n\n" <> tmpIssue) Directory.createDirectoryIfMissing True "reviews"
let dstReview = "reviews" </>
fromString (toS ("review-" <> protectStr br <> ".org"))
appendFile (toS (format fp dstReview)) ("\n\n" <> tmpReview)
data NewReview = data NewReview =
NewReview { status :: Text NewReview { status :: Text
@ -194,7 +198,9 @@ createTmpNewReview nr = do
die "Parse ERROR, check your template ./templates/new-review.org" die "Parse ERROR, check your template ./templates/new-review.org"
Right compiled -> do Right compiled -> do
reviewName <- getTmpReviewFile (fromMaybe "no-name" (branch nr)) reviewName <- getTmpReviewFile (fromMaybe "no-name" (branch nr))
writeFile (toS (format fp reviewName)) (substitute compiled nr) let tmpReviewFilename = format fp reviewName
writeFile (toS tmpReviewFilename) (substitute compiled nr)
putText $ "Review file: " <> tmpReviewFilename
interactiveNewReview :: NewReview -> IO NewReview interactiveNewReview :: NewReview -> IO NewReview
interactiveNewReview nr = interactiveNewReview nr =