Commit 313b797

piq9117Gitea

piq9117

authored and

Gitea

committed

refactor: reduced directory name repitition (#18)

- directory name placed in where clause so it's not littered in the function.

1 parent 1f1ddca commit 313b797Copy full SHA for 313b797

File tree

1 file changed

+29

-19

lines changed

src/UmuReactBasic/Capability
- ManageCommand.hs

1 file changed

+29

-19

lines changed

`‎src/UmuReactBasic/Capability/ManageCommand.hs`

Lines changed: 29 additions & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,22 +71,45 @@ writeSrcDir :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
`71`	`71`	`writeSrcDir mLoc = do`
`72`	`72`	`res <- liftIO`
`73`	`73`	`$ tryJust ( guard . isAlreadyExistsError )`
`74`		`- $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc "src" )`
	`74`	`+ $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc dirName )`
`75`	`75`	`either`
`76`		`- ( const $ logError "src directory already exists!" )`
`77`		`- ( const $ logInfo "Generating src..." )`
	`76`	`+ ( const $ logError $ dirName <>" directory already exists!" )`
	`77`	`+ ( const $ logInfo $"Generating "<> dirName <>"..." )`
`78`	`78`	`res`
	`79`	`+ where`
	`80`	`+ dirName :: Text`
	`81`	`+ dirName = "src"`
	`82`	`+`
`79`	`83`
`80`	`84`	`writeAssetsDir :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
`81`	`85`	`writeAssetsDir mLoc = do`
`82`	`86`	`res <- liftIO`
`83`	`87`	`$ tryJust ( guard . isAlreadyExistsError )`
`84`		`- $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc "assets" )`
	`88`	`+ $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc dirName )`
	`89`	`+ either`
	`90`	`+ ( const $ logError $ dirName <> " directory already exists!" )`
	`91`	`+ ( const $ logInfo $ "Generating " <> dirName <> "..." )`
	`92`	`+ res`
	`93`	`+ where`
	`94`	`+ dirName :: Text`
	`95`	`+ dirName = "assets"`
	`96`	`+`
	`97`	`+writeComponentDir :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
	`98`	`+writeComponentDir mLoc = do`
	`99`	`+ res <- liftIO`
	`100`	`+ $ tryJust ( guard . isAlreadyExistsError )`
	`101`	`+ $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc dirName )`
`85`	`102`	`either`
`86`		`- ( const $ logError "assets directory already exists!" )`
`87`		`- ( const $ logInfo "Generating assets..." )`
	`103`	`+ ( const $ logError $ dirName <>" directory already exists!" )`
	`104`	`+ ( const $ logInfo $"Generating "<> dirName <>"..." )`
`88`	`105`	`res`
	`106`	`+ where`
	`107`	`+ dirName :: Text`
	`108`	`+ dirName = "src/Component"`
`89`	`109`
	`110`	`+------------------------------------------`
	`111`	`+--- FILE GENERATION`
	`112`	`+------------------------------------------`
`90`	`113`	`writeIndexHtml :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
`91`	`114`	`writeIndexHtml mLoc = do`
`92`	`115`	`isExists <- TP.testfile $ Turtle.fromText $ mkPathName mLoc "assets/index.html"`
`@@ -108,19 +131,6 @@ writeSrcMainFile mLoc = do`
`108`	`131`	`( Turtle.fromText $ mkPathName mLoc "/src/Main.purs" ) srcMainFile`
`109`	`132`	`logInfo "Generating src/Main.purs..."`
`110`	`133`
`111`		`-writeComponentDir :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
`112`		`-writeComponentDir mLoc = do`
`113`		`- res <- liftIO`
`114`		`- $ tryJust ( guard . isAlreadyExistsError )`
`115`		`- $ TP.mkdir ( Turtle.fromText $ mkPathName mLoc "src/Component" )`
`116`		`- either`
`117`		`- ( const $ logError "src/Component directory already exists!" )`
`118`		`- ( const $ logInfo "Generating Component..." )`
`119`		`- res`
`120`		`-`
`121`		`-------------------------------------------`
`122`		`---- FILE GENERATION`
`123`		`-------------------------------------------`
`124`	`134`	`writeTitleComponentFile :: ( MonadIO m, LogMessage m ) => Maybe Text -> m ()`
`125`	`135`	`writeTitleComponentFile mLoc = do`
`126`	`136`	`isExists <- TP.testfile $ Turtle.fromText $ mkPathName mLoc "src/Component/Title.purs"`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 313b797

File tree

1 file changed

1 file changed

`‎src/UmuReactBasic/Capability/ManageCommand.hs`

0 commit comments