Add Contents example to cabal file and update code.

scott-fleischman · scott-fleischman · commit 8a851fe960ee · 2017-07-24T10:31:16.000-07:00
diff --git a/samples/Repos/Contents.hs b/samples/Repos/Contents.hs
@@ -1,9 +1,18 @@
-module GetContents where
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE OverloadedStrings #-}
 
-import qualified Github.Repos as Github
-import Data.List
-import Prelude hiding (truncate, getContents)
+module Main where
 
+import           Common                          hiding
+                 (getContents, intercalate, take, truncate, unlines)
+import           Data.Text
+                 (Text, intercalate, pack, take, unlines)
+import           Data.Text.IO                    (putStrLn)
+import qualified Data.Vector                     as Vector
+import qualified GitHub.Data                     as GitHub
+import qualified GitHub.Endpoints.Repos.Contents as GitHub
+
+main :: IO ()
 main = do
   putStrLn "Root"
   putStrLn "===="
@@ -13,34 +22,37 @@ main = do
   putStrLn "======="
   getContents "LICENSE"
 
+getContents :: Text -> IO ()
 getContents path = do
-  contents <- Github.contentsFor "mike-burns" "ohlaunch" path Nothing
-  putStrLn $ either (("Error: " ++) . show) formatContents contents
+  contents <- GitHub.contentsFor "mike-burns" "ohlaunch" path Nothing
+  putStrLn $ either (("Error: " <>) . tshow) formatContents contents
 
-formatContents (Github.ContentFile fileData) =
-  formatContentInfo (Github.contentFileInfo fileData) ++
+formatContents :: GitHub.Content -> Text
+formatContents (GitHub.ContentFile fileData) =
+  formatContentInfo (GitHub.contentFileInfo fileData) <>
   unlines
-    [ show (Github.contentFileSize fileData) ++ " bytes"
-    , "encoding: " ++ Github.contentFileEncoding fileData
-    , "data: " ++ truncate (Github.contentFileContent fileData)
+    [ tshow (GitHub.contentFileSize fileData) <> " bytes"
+    , "encoding: " <> GitHub.contentFileEncoding fileData
+    , "data: " <> truncate (GitHub.contentFileContent fileData)
     ]
 
-formatContents (Github.ContentDirectory items) =
-  intercalate "\n\n" $ map formatItem items
+formatContents (GitHub.ContentDirectory items) =
+  intercalate "\n\n" . map formatItem . Vector.toList $ items
 
+formatContentInfo :: GitHub.ContentInfo -> Text
 formatContentInfo contentInfo =
   unlines
-    [ "name: " ++ Github.contentName contentInfo
-    , "path: " ++ Github.contentPath contentInfo
-    , "sha: " ++ Github.contentSha contentInfo
-    , "url: " ++ Github.contentUrl contentInfo
-    , "git url: " ++ Github.contentGitUrl contentInfo
-    , "html url: " ++ Github.contentHtmlUrl contentInfo
+    [ "name: " <> GitHub.contentName contentInfo
+    , "path: " <> GitHub.contentPath contentInfo
+    , "sha: " <> GitHub.contentSha contentInfo
+    , "url: " <> (GitHub.getUrl . GitHub.contentUrl) contentInfo
+    , "git url: " <> (GitHub.getUrl . GitHub.contentGitUrl) contentInfo
+    , "html url: " <> (GitHub.getUrl . GitHub.contentHtmlUrl) contentInfo
     ]
 
 formatItem item =
-   "type: " ++ show (Github.contentItemType item) ++ "\n" ++
-  formatContentInfo (Github.contentItemInfo item)
+   "type: " <> tshow (GitHub.contentItemType item) <> "\n" <>
+  formatContentInfo (GitHub.contentItemInfo item)
 
 
-truncate str = take 40 str ++ "... (truncated)"
+truncate str = take 40 str <> "... (truncated)"
diff --git a/samples/github-samples.cabal b/samples/github-samples.cabal
@@ -190,6 +190,20 @@ executable github-operational
     , transformers-compat
   default-language: Haskell2010
 
+executable github-repos-contents-example
+  main-is: Contents.hs
+  hs-source-dirs:
+      Repos
+  ghc-options: -Wall
+  build-depends:
+      base
+    , base-compat
+    , github
+    , github-samples
+    , text
+    , vector
+  default-language: Haskell2010
+
 executable github-show-deploy-key
   main-is: ShowDeployKey.hs
   hs-source-dirs:
