on master help sign in
Upload docs map
commit8651984bf3d59ee38c42705f1d35bb0c5fe706ef authorMichael Snoyman <michael@snoyman.com> dateSat 13 Dec 2014, 20:42 (12 years ago) parentbc5b77b
4 files changed+86−1
Stackage2/CompleteBuild.hs+9 Stackage2/ServerBundle.hs+44 Stackage2/Upload.hs+32−1 stackage.cabal+1
Stackage2/CompleteBuild.hs+9
@@ -178,4 +178,13 @@ completeBuild buildType = withManager defaultManagerSettings $ \man -> do
178178 putStrLn $ "Distro upload response: " ++ tshow res2
179179 _ -> putStrLn "No creds found, skipping Hackage distro upload"
180180
181+ putStrLn "Uploading doc map"
182+ uploadDocMap UploadDocMap
183+ { udmServer = def
184+ , udmAuthToken = decodeUtf8 token
185+ , udmSnapshot = ident
186+ , udmDocDir = pbDocDir pb
187+ , udmPlan = plan
188+ } man >>= print
189+
181190 postBuild
Stackage2/ServerBundle.hs+44
@@ -6,6 +6,7 @@ module Stackage2.ServerBundle
66 ( serverBundle
77 , epochTime
88 , bpAllPackages
9+ , docsListing
910 ) where
1011
1112import qualified Codec.Archive.Tar as Tar
@@ -17,6 +18,9 @@ import Stackage2.BuildConstraints
1718import Stackage2.BuildPlan
1819import Stackage2.Prelude
1920import qualified System.PosixCompat.Time as PC
21+import qualified Text.XML as X
22+import Text.XML.Cursor
23+import Filesystem (isFile)
2024
2125-- | Get current time
2226epochTime :: IO Tar.EpochTime
@@ -61,3 +65,43 @@ serverBundle time title slug bp@BuildPlan {..} = GZip.compress $ Tar.write
6165 toBuilder (asText "-") ++
6266 toBuilder (display version) ++
6367 toBuilder (asText "\n")
68+
69+docsListing :: BuildPlan
70+ -> FilePath -- ^ docs directory
71+ -> IO ByteString
72+docsListing bp docsDir =
73+ fmap (Y.encode . fold) $ mapM go $ mapToList $ bpAllPackages bp
74+ where
75+ go :: (PackageName, Version) -> IO (Map Text Y.Value)
76+ go (package, version) = do -- handleAny (const $ return mempty) $ do
77+ let dirname = fpFromText (concat
78+ [ display package
79+ , "-"
80+ , display version
81+ ])
82+ indexFP = (docsDir </> dirname </> "index.html")
83+ ie <- isFile indexFP
84+ if ie
85+ then do
86+ doc <- flip X.readFile indexFP X.def
87+ { X.psDecodeEntities = X.decodeHtmlEntities
88+ }
89+ let cursor = fromDocument doc
90+ getPair x = take 1 $ do
91+ href <- attribute "href" x
92+ let name = concat $ x $// content
93+ guard $ not $ null name
94+ return (href, name)
95+ pairs = cursor $// attributeIs "class" "module"
96+ &/ laxElement "a" >=> getPair
97+ m <- fmap fold $ forM pairs $ \(href, name) -> do
98+ let suffix = dirname </> fpFromText href
99+ e <- isFile $ docsDir </> suffix
100+ return $ if e
101+ then asMap $ singletonMap name [fpToText dirname, href]
102+ else mempty
103+ return $ singletonMap (display package) $ Y.object
104+ [ "version" Y..= display version
105+ , "modules" Y..= m
106+ ]
107+ else return mempty
Stackage2/Upload.hs+32−1
@@ -11,6 +11,8 @@ module Stackage2.Upload
1111 , UploadDocs (..)
1212 , uploadDocs
1313 , uploadHackageDistro
14+ , UploadDocMap (..)
15+ , uploadDocMap
1416 ) where
1517
1618import Control.Monad.Writer.Strict (execWriter, tell)
@@ -20,7 +22,7 @@ import Network.HTTP.Client
2022import Network.HTTP.Client.MultipartFormData
2123import Stackage2.BuildPlan (BuildPlan)
2224import Stackage2.Prelude
23−import Stackage2.ServerBundle (bpAllPackages)
25+import Stackage2.ServerBundle (bpAllPackages, docsListing)
2426import System.IO.Temp (withSystemTempFile)
2527
2628newtype StackageServer = StackageServer { unStackageServer :: Text }
@@ -169,6 +171,35 @@ uploadHackageDistro bp username password =
169171 , method = "PUT"
170172 }
171173
174+data UploadDocMap = UploadDocMap
175+ { udmServer :: StackageServer
176+ , udmAuthToken :: Text
177+ , udmSnapshot :: SnapshotIdent
178+ , udmDocDir :: FilePath
179+ , udmPlan :: BuildPlan
180+ }
181+
182+uploadDocMap UploadDocMap {..} man = do
183+ docmap <- docsListing udmPlan udmDocDir
184+ req1 <- parseUrl $ unpack $ unStackageServer udmServer ++ "/upload-doc-map"
185+ req2 <- formDataBody (formData docmap) req1
186+ let req3 = req2
187+ { method = "PUT"
188+ , requestHeaders =
189+ [ ("Authorization", encodeUtf8 udmAuthToken)
190+ , ("Accept", "application/json")
191+ ] ++ requestHeaders req2
192+ , redirectCount = 0
193+ , checkStatus = \_ _ _ -> Nothing
194+ , responseTimeout = Just 300000000
195+ }
196+ httpLbs req3 man
197+ where
198+ formData docmap =
199+ [ partBS "snapshot" (encodeUtf8 $ unSnapshotIdent udmSnapshot)
200+ , partFileRequestBody "docmap" "docmap" $ RequestBodyBS docmap
201+ ]
202+
172203mkIndex :: String -> [String] -> String
173204mkIndex snapid dirs = concat
174205 [ "<!DOCTYPE html>\n<html lang='en'><head><title>Haddocks index</title>"
stackage.cabal+1
@@ -75,6 +75,7 @@ library
7575 , async
7676 , streaming-commons >= 0.1.7.1
7777 , semigroups
78+ , xml-conduit
7879
7980executable stackage
8081 default-language: Haskell2010