Merge pull request #1 from Heather/master

lesser code maid, warning driven
gentoo-haskell · Aug 15, 2013 · 0ab1543 · 0ab1543
2 parents fa9028f + 709284a
commit 0ab1543
Showing 1 changed file with 28 additions and 10 deletions.
diff --git a/Main.hs b/Main.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE PatternGuards #-}
+
 module Main ( main ) where
 
 --import qualified Data.ByteString as B
@@ -18,8 +20,8 @@ main = do
     let (packages_file, wd) =
             case args of
                 []      -> (Nothing, ".")
-                [wd]    -> (Nothing, wd)
+                [wx]    -> (Nothing, wx)
-                [pf,wd] -> (Just pf, wd)
+                [pf,wx] -> (Just pf, wx)
     ebuilds <-
         case packages_file of
             Just pf -> do pkgs <- filter (not . L.isPrefixOf "#") . lines <$> readFile pf
@@ -73,16 +75,22 @@ findPackages dir = do
         files <- filterM doesFileExist items
         return (dirs,files)
 
+packageRegex :: R.Regex
 packageRegex = R.compile "^(.*)/(.*?)-([\\d.]+)([-_].*?)?$" []
+
+keywordRegex :: R.Regex
 keywordRegex = R.compile "^KEYWORDS=\"(.*)\".*" [R.multiline]
-versionRegex name = R.compile ("^" ++ name ++ "-(.*).ebuild$") []
 
+--versionRegex name = R.compile ("^" ++ name ++ "-(.*).ebuild$") []
+
+extractCPVR_pkgLine :: String -> (String, String, String)
 extractCPVR_pkgLine pkg_line =
     case R.match packageRegex pkg_line [] of
       Just [_, cat,pkg,ver] -> (cat, pkg, ver)
       Just [_, cat,pkg,ver,suf] -> (cat, pkg, ver ++ suf)
       x -> error (show x)
-
+
+extractCPVR_m :: FilePath -> Maybe String
 extractCPVR_m text =
     case reverse (splitDirectories text) of
       -- ../gentoo-haskell/x11-wm/xmonad/xmonad-0.8
@@ -95,17 +103,19 @@ extractCPVR_m text =
       -- [ xmonad-0.8 , . ]
       [pvr, _] -> Just pvr
       -- ??
-      x -> Just ("?:" ++ text)
+      _ -> Just ("?:" ++ text)
 
+extractCPVR :: FilePath -> String
 extractCPVR text =
     case extractCPVR_m text of
         Just x -> x
         Nothing -> error text
 
+extractKeywords :: [Char] -> [Arch]
 extractKeywords text = map toArch $ words k
     where (Just [_,k]) = R.match keywordRegex text []
 
-cpvToEbuild (c,p,v,r) = c </> p </> p <-> v ++ r ++ ".ebuild"
+-- cpvToEbuild (c,p,v,r) = c </> p </> p <-> v ++ r ++ ".ebuild"
 
 (</>) :: String -> String -> String
 b </> n = b ++ '/':n
@@ -121,18 +131,23 @@ data Arch
   = Stable String
   | Masked String
   | Unavailable String deriving (Eq,Show)
+
+fromArch :: Arch -> String
 fromArch (Stable a) = a
 fromArch (Masked a) = a
 fromArch (Unavailable a) = a
 
+toArch :: [Char] -> Arch
 toArch str =
     case str of
         ('~':arch) -> Masked arch
         ('-':arch) -> Unavailable arch
         _          -> Stable str
 
-sameArch a b = (fromArch a) == (fromArch b)
+-- sameArch :: Arch -> Arch -> Bool
+-- sameArch a b = (fromArch a) == (fromArch b)
 
+showArch :: Arch -> String
 showArch (Stable a) = a
 showArch (Masked a) = '~' : a
 showArch (Unavailable a) = '-' : a
@@ -150,11 +165,14 @@ arches = map toArch . sort . words $ "alpha amd64 ia64 ppc ppc64 sparc x86 x86-f
 -----------------------------------------------------------------------
 
 data Alignment
-        = LeftAlign   {                   fromAlign :: Int }
+        = LeftAlign   {                    fromAlign :: Int }
-        | CenterAlign { fillChar :: Char, fromAlign :: Int }
+        | CenterAlign { _fillChar :: Char, fromAlign :: Int }
-        | RightAlign  {                   fromAlign :: Int }
+        | RightAlign  {                    fromAlign :: Int }
 
+prettyColumns :: [Alignment]
 prettyColumns = LeftAlign 35 : map (\arch -> RightAlign (2 + length (fromArch arch))) arches
+
+prettyHeader :: [[Char]]
 prettyHeader = "package" : map fromArch arches
 
 pretty :: [Alignment] -> [String] -> IO ()