Bump the version number to 0.0.4 in hath.cabal.

[hath.git] / src / Main.hs

diff --git a/src/Main.hs b/src/Main.hs
index dd7eefe963e5aedb5c0b19d486f1cc510d470fac..d8c760080df39c9cf2d0a29021b2271ea970adb4 100644 (file)
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,13 +1,18 @@
-import Control.Monad (when)
-import Data.List ((\\), intercalate, intersperse)
+import Control.Concurrent.ParallelIO.Global (
+  parallel,
+  stopGlobalPool )
+import Control.Monad (unless, when)
+import qualified Data.ByteString.Char8 as BS (intercalate, pack, unpack)
+import Data.List ((\\), intercalate)
 import Data.Maybe (catMaybes, isNothing)
 import Data.String.Utils (splitWs)
-import System.Exit (ExitCode(..), exitWith)
+import System.Exit (ExitCode(..), exitSuccess, exitWith)
 import System.IO (stderr, hPutStrLn)
 
 import Cidr (Cidr(..),
              cidr_from_string,
              combine_all,
+             enumerate,
              max_octet1,
              max_octet2,
              max_octet3,
@@ -24,9 +29,10 @@ import CommandLine (help_set,
                     parse_errors,
                     parse_mode)
 
+import DNS (Domain, lookup_ptrs)
 import ExitCodes
 import Octet
-    
+
 
 -- | A regular expression that matches a non-address character.
 non_addr_char :: String
@@ -71,7 +77,7 @@ cidr_to_regex cidr =
 -- | Take a list of Strings, and return a regular expression matching
 --   any of them.
 alternate :: [String] -> String
-alternate terms = "(" ++ (concat (intersperse "|" terms)) ++ ")"
+alternate terms = "(" ++ (intercalate "|" terms) ++ ")"
 
 
 -- | Take two Ints as parameters, and return a regex matching any
@@ -89,7 +95,7 @@ main = do
   -- First, check for any errors that occurred while parsing
   -- the command line options.
   errors <- CommandLine.parse_errors
-  when ((not . null) errors) $ do
+  unless (null errors) $ do
     hPutStrLn stderr (concat errors)
     putStrLn CommandLine.help_text
     exitWith (ExitFailure exit_args_parse_failed)
@@ -99,7 +105,7 @@ main = do
   help_opt_set <- CommandLine.help_set
   when help_opt_set $ do
     putStrLn CommandLine.help_text
-    exitWith ExitSuccess
+    exitSuccess
 
   -- The input function we receive here should know what to read.
   inputfunc <- (CommandLine.input_function)
@@ -122,20 +128,42 @@ main = do
     Regex -> do
       let regexes = map cidr_to_regex valid_cidrs
       putStrLn $ alternate regexes
-    Reduce -> do
-      _ <- mapM (putStrLn . show) (combine_all valid_cidrs)
-      return ()
-    Dupe -> do
-       _ <- mapM (putStrLn . show) dupes
-       return ()
+    Reduce ->
+      mapM_ print (combine_all valid_cidrs)
+    Dupe ->
+       mapM_ print dupes
        where
          dupes = valid_cidrs \\ (combine_all valid_cidrs)
     Diff -> do
-       _ <- mapM putStrLn deletions
-       _ <- mapM putStrLn additions
-       return ()
+       mapM_ putStrLn deletions
+       mapM_ putStrLn additions
        where
          dupes = valid_cidrs \\ (combine_all valid_cidrs)
-         deletions = map (\s -> "-" ++ (show s)) dupes
+         deletions = map (\s -> '-' : (show s)) dupes
          newcidrs = (combine_all valid_cidrs) \\ valid_cidrs
-         additions = map (\s -> "+" ++ (show s)) newcidrs
+         additions = map (\s -> '+' : (show s)) newcidrs
+    List -> do
+      let combined_cidrs = combine_all valid_cidrs
+      let addrs = concatMap enumerate combined_cidrs
+      mapM_ print addrs
+    Reverse -> do
+      let combined_cidrs = combine_all valid_cidrs
+      let addrs = concatMap enumerate combined_cidrs
+      let addr_bytestrings = map (BS.pack . show) addrs
+      ptrs <- lookup_ptrs addr_bytestrings
+      let pairs = zip addr_bytestrings ptrs
+      _ <- parallel (map (putStrLn . show_pair) pairs)
+      return ()
+
+  stopGlobalPool
+
+  where
+    show_pair :: (Domain, Maybe [Domain]) -> String
+    show_pair (s, mds) =
+      (BS.unpack s) ++ ": " ++ results
+      where
+        space = BS.pack " "
+        results =
+          case mds of
+            Nothing -> ""
+            Just ds -> BS.unpack $ BS.intercalate space ds