boomange 0.1.3.3 → 0.1.3.5
raw patch · 3 files changed
+20/−43 lines, 3 filesdep ~base
Dependency ranges changed: base
Files
- Main.hs +9/−32
- boomange.1 +3/−3
- boomange.cabal +8/−8
Main.hs view
@@ -36,10 +36,8 @@ import Data.Entities hiding (name) import Data.Loader -- appName = "boomange"-appVersion = "0.1.3.3"+appVersion = "0.1.3.5" -- header to be used on the sample config file configHeader = "# This is the configuration file for " ++ appName ++ "\n" ++@@ -59,12 +57,12 @@ "# For a full description of its syntax, see the haddock documentation for SimtreeLo\n" ++ "# The first line indicates the comment pattern" ++ "# Leaves represent the URI of their direct parents\n"- + generateBookmarks config = do header <- readFile $ headerFile config footer <- readFile $ footerFile config final <- openFile (outputFile config) WriteMode- + bookmarks <- loadBookmarks $ watch config let body = htmlBookmarks bookmarks hPutStr final header@@ -82,7 +80,7 @@ getConfigDirectory appName = let failXDG e = do dir <- getEnv "HOME"- return $ dir ++ [pathSeparator] ++ ".config" ++ [pathSeparator] ++ appName + return $ dir ++ [pathSeparator] ++ ".config" ++ [pathSeparator] ++ appName failHOME e = getAppUserDataDirectory appName in do@@ -94,7 +92,7 @@ -- | installs a basic configuration installConfig cDir = let htmlDir = cDir ++ [pathSeparator] ++ "html"- bookFile = cDir ++ [pathSeparator] ++ "bookmarks" + bookFile = cDir ++ [pathSeparator] ++ "bookmarks" outFile = cDir ++ [pathSeparator] ++ "bookmarks.html" config = Description@@ -119,7 +117,7 @@ "Boomange\n\tDocumentation\n" ++ "\t\tDescriLo\n\t\t\thttp://hackage.haskell.org/package/descrilo-0.1.0.0/docs/Data-DescriLo.html\n" ++ "\t\tSimtreeLo\n\t\t\thttp://hackage.haskell.org/package/simtreelo-0.1.0.0/docs/Data-Simtreelo.html\n"- + cFile = cDir ++ [pathSeparator] ++ "config" in do@@ -147,7 +145,7 @@ hPutStr hBookmarks bookmarksHeader hPutStr hBookmarks $ sampleBookmarks hClose hBookmarks- + data Action = Help | ConfigFile String | Version | Status | Add String String String | Invalid String | Generate deriving Eq parseArgs args activeConfig = case args of@@ -180,8 +178,8 @@ -- adds the bookmark to the respective simtreelo file Just (foundId, treeFile) -> addBookmarkTree (tail r) uri treeFile Nothing -> putStr "invalid configuration file"- + addBookmarkTree bookmark uri treeFile = do let bookmarkTree = pathToTree bookmark uri oldForest <- Simtreelo.loadFile treeFile@@ -230,7 +228,7 @@ showStatus :: String -> IO [String] showStatus configFile = do- config <- loadConfig configFile + config <- loadConfig configFile return $ printf "%s:" configFile : (printf "\tOutput file:\n\t\t%s" (outputFile config)) : (printf "\tHeader file:\n\t\t%s" (headerFile config)) :@@ -238,15 +236,6 @@ "\tBookmarks files:" : (map (\x -> "\t\t" ++ x) $ watch config) -{--separateConfigs [] = ([],[])-separateConfigs (h:r) =- let (actions, configs) = separateConfigs r in- case h of- ConfigFile x -> (actions, x : configs)- other -> (other : actions, configs)--}- main = do args <- getArgs let (argConfigs', argActions) = partition (\x -> case x of ConfigFile _ -> True ; _ -> False) $ parseArgs args ""@@ -264,15 +253,3 @@ return $ [cDir ++ "/config"] else (return argConfigs) execute actions "" configs- -{- - cDir <- getConfigDirectory appName- -- if the configuration directory does not exists, sets it up- confExists <- doesDirectoryExist cDir- when (not confExists) $ do- createDirectoryIfMissing True cDir- installConfig cDir- let cFile = cDir ++ "/config"- config <- loadConfig cFile- generateBookmarks config--}
boomange.1 view
@@ -1,6 +1,6 @@ .\" Manpage for boomange. .\" Contact marcelogmillani@gmail.com to correct errors or typos.-.TH man 1 "19 Apr 2015" "0.1.3.0" "boomange man page"+.TH man 1 "2017.09.28" "0.1.3.5" "boomange man page" .SH NAME boomange \- generates an HTML file with bookmarks .SH SYNOPSIS@@ -38,7 +38,7 @@ .SH FILES boomange stores its configuration files in one of these directories by default: -.IP \(bu 2 +.IP \(bu 2 $XDG_CONFIG_HOME/boomange .IP \(bu $HOME/.config/boomange@@ -49,7 +49,7 @@ When executed, boomange searches for the config file inside the configuration folder, which uses descrilo syntax. It contains 2 descriptions: -.IP \(bu +.IP \(bu config \- configuration of what boomange should do. The possible values inside are: .RS .IP \(bu 2
boomange.cabal view
@@ -2,28 +2,28 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: boomange-version: 0.1.3.3-synopsis: A Bookmarks manager with a HTML generator+version: 0.1.3.5+synopsis: A bookmarks manager with an HTML generator description: In order to allow a unified and customized bookmarks file, boomange generates a HTML file with an user's bookmarks. license: GPL-3 license-file: LICENSE author: Marcelo Garlet Millani maintainer: marcelogmillani@gmail.com-copyright: (c) 2013-2016 Marcelo Garlet Millani+copyright: (c) 2013-2017 Marcelo Garlet Millani category: Web build-type: Simple-data-files: html/footer.html , html/header.html, style.css+data-files: html/footer.html, html/header.html, style.css extra-doc-files: README, boomange.1-cabal-version: >=1.10+cabal-version: >=1.18 executable boomange main-is: Main.hs -- other-modules: -- other-extensions:- build-depends: base >=4.8 && <= 4.10, directory >=1.2 && <1.4, filepath >=1.4 && <1.5, descrilo >=0.1 && <0.2, containers >=0.5 && <0.6, simtreelo >=0.1 && <0.2+ build-depends: base >=4.8 && <4.11, directory >=1.2 && <1.4, filepath >=1.4 && <1.5, descrilo >=0.1 && <0.2, containers >=0.5 && <0.6, simtreelo >=0.1 && <0.2 -- hs-source-dirs:- other-modules: Data.Entities, Data.Loader, Data.Builder- default-extensions: DoAndIfThenElse+ other-modules: Data.Entities, Data.Loader, Data.Builder, Paths_boomange+ default-extensions: DoAndIfThenElse default-language: Haskell2010 source-repository head