From 93f91708ca8bada76f4bf0e623862107e7488623 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 16 Mar 2015 11:40:44 +0200 Subject: [PATCH] Make it compile --- Foundation.hs | 9 +++++++++ Handler/UploadV2.hs | 5 ++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Foundation.hs b/Foundation.hs index 5aae958..92f87b4 100644 --- a/Foundation.hs +++ b/Foundation.hs @@ -23,6 +23,8 @@ import Yesod.Core.Types (Logger, GWData) import Yesod.Default.Config import Yesod.Default.Util (addStaticContentExternal) import Yesod.GitRepo +import Stackage.ServerBundle (SnapshotType, DocMap) +import Stackage.BuildPlan (BuildPlan) -- | The site argument for your application. This can be a good place to -- keep settings and values requiring initialization before your application @@ -47,6 +49,12 @@ data App = App , websiteContent :: GitRepo WebsiteContent } +data SnapshotInfo = SnapshotInfo + { siType :: !SnapshotType + , siPlan :: !BuildPlan + , siDocMap :: !DocMap + } + data DocUnpacker = DocUnpacker { duRequestDocs :: Entity Stackage -> IO UnpackStatus , duGetStatus :: IO Text @@ -158,6 +166,7 @@ instance Yesod App where maximumContentLength _ (Just UploadStackageR) = Just 50000000 maximumContentLength _ (Just UploadHaddockR{}) = Just 100000000 + maximumContentLength _ (Just UploadV2R) = Just 100000000 maximumContentLength _ _ = Just 2000000 instance ToMarkup (Route App) where diff --git a/Handler/UploadV2.hs b/Handler/UploadV2.hs index 82076cc..ec7f0d0 100644 --- a/Handler/UploadV2.hs +++ b/Handler/UploadV2.hs @@ -95,9 +95,9 @@ doUpload status uid ident bundleFP = do say $ "Unpacking bundle" master <- getYesod - liftIO $ haddockUnpacker master True ident + -- FIXME liftIO $ haddockUnpacker master True ident - SnapshotInfo {..} <- getSnapshotInfoByIdent ident + SnapshotInfo {..} <- error "FIXME getSnapshotInfoByIdent ident" now <- liftIO getCurrentTime let day = tshow $ utctDay now @@ -183,7 +183,6 @@ doUpload status uid ident bundleFP = do , stackageTitle = title , stackageDesc = "" , stackageHasHaddocks = True - , stackageYaml = True } case siType of STNightly -> insert_ Nightly