mirror of
https://github.com/input-output-hk/foliage.git
synced 2024-12-01 21:02:16 +03:00
Tweaks
This commit is contained in:
Andrea Bedini
parent
8a2e571404
commit
934e4e8261
@ -162,6 +162,7 @@ cmdBuild
|
||||
|
||||
keys <- readKeysAt (keysPath </> "timestamp")
|
||||
let timestampSigned = withSignatures hackageRepoLayout keys timestamp
|
||||
traced "writing" $
|
||||
liftIO $ do
|
||||
p <- makeAbsolute (fromFilePath path)
|
||||
writeJSON hackageRepoLayout p timestampSigned
|
||||
@ -188,6 +189,7 @@ cmdBuild
|
||||
|
||||
keys <- readKeysAt (keysPath </> "snapshot")
|
||||
let snapshotSigned = withSignatures hackageRepoLayout keys snapshot
|
||||
traced "writing" $
|
||||
liftIO $ do
|
||||
p <- makeAbsolute (fromFilePath path)
|
||||
writeJSON hackageRepoLayout p snapshotSigned
|
||||
@ -250,6 +252,7 @@ cmdBuild
|
||||
|
||||
keys <- readKeysAt (keysPath </> "root")
|
||||
let signedRoot = withSignatures hackageRepoLayout keys root
|
||||
traced "writing" $
|
||||
liftIO $ do
|
||||
p <- makeAbsolute (fromFilePath path)
|
||||
writeJSON hackageRepoLayout p signedRoot
|
||||
@ -269,6 +272,7 @@ cmdBuild
|
||||
|
||||
keys <- readKeysAt (keysPath </> "mirrors")
|
||||
let signedMirrors = withSignatures hackageRepoLayout keys mirrors
|
||||
traced "writing" $
|
||||
liftIO $ do
|
||||
p <- makeAbsolute (fromFilePath path)
|
||||
writeJSON hackageRepoLayout p signedMirrors
|
||||
@ -281,35 +285,37 @@ cmdBuild
|
||||
pkgIds <- getPackages GetPackages
|
||||
|
||||
entries <-
|
||||
fmap concat $
|
||||
for pkgIds $ \pkgId -> do
|
||||
flip foldMap pkgIds $ \pkgId -> do
|
||||
let PackageId {pkgName, pkgVersion} = pkgId
|
||||
PackageMeta {packageTimestamp, packageRevisions} <- getPackageMeta (GetPackageMeta pkgId)
|
||||
|
||||
srcDir <- preparePackageSource $ PreparePackageSource pkgId
|
||||
now <- getCurrentTime GetCurrentTime
|
||||
|
||||
sequence $
|
||||
[ -- original cabal file
|
||||
-- original cabal file
|
||||
cabalEntry <-
|
||||
mkTarEntry
|
||||
(srcDir </> pkgName <.> "cabal")
|
||||
(pkgName </> pkgVersion </> pkgName <.> "cabal")
|
||||
(fromMaybe now packageTimestamp),
|
||||
(fromMaybe now packageTimestamp)
|
||||
|
||||
-- package.json
|
||||
packageEntry <-
|
||||
mkTarEntry
|
||||
(outputDir </> "index" </> pkgName </> pkgVersion </> "package.json")
|
||||
(pkgName </> pkgVersion </> "package.json")
|
||||
(fromMaybe now packageTimestamp)
|
||||
]
|
||||
++ [ -- revised cabal files
|
||||
mkTarEntry
|
||||
(inputDir </> pkgName </> pkgVersion </> "revisions" </> show revNum <.> "cabal")
|
||||
(pkgName </> pkgVersion </> pkgName <.> "cabal")
|
||||
(fromMaybe now revTimestamp)
|
||||
| RevisionMeta revTimestamp revNum <- packageRevisions
|
||||
]
|
||||
|
||||
liftIO $ BSL.writeFile path $ Tar.write (sortOn Tar.entryTime entries)
|
||||
-- revised cabal files
|
||||
revisionEntries <- for packageRevisions $ \RevisionMeta {revisionNumber, revisionTimestamp} ->
|
||||
mkTarEntry
|
||||
(inputDir </> pkgName </> pkgVersion </> "revisions" </> show revisionNumber <.> "cabal")
|
||||
(pkgName </> pkgVersion </> pkgName <.> "cabal")
|
||||
(fromMaybe now revisionTimestamp)
|
||||
|
||||
return $ cabalEntry : packageEntry : revisionEntries
|
||||
|
||||
traced "writing" $ liftIO $ BSL.writeFile path $ Tar.write (sortOn Tar.entryTime entries)
|
||||
|
||||
--
|
||||
-- 01-index.tar.gz
|
||||
@ -317,7 +323,7 @@ cmdBuild
|
||||
|
||||
outputDir </> "01-index.tar.gz" %> \path -> do
|
||||
tar <- readFileByteStringLazy (outputDir </> "01-index.tar")
|
||||
liftIO $ BSL.writeFile path (GZip.compress tar)
|
||||
traced "writing" $ liftIO $ BSL.writeFile path (GZip.compress tar)
|
||||
|
||||
--
|
||||
-- index cabal files
|
||||
|
||||
@ -15,8 +15,8 @@ import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
|
||||
import Foliage.Meta
|
||||
import Foliage.Options
|
||||
import Foliage.Package
|
||||
import System.Directory qualified as IO
|
||||
import System.Environment
|
||||
import System.Directory (createDirectoryIfMissing)
|
||||
import System.Environment (getEnv)
|
||||
import System.FilePath
|
||||
|
||||
cmdImportHackage :: ImportHackageOptions -> IO ()
|
||||
@ -48,11 +48,8 @@ importIndex f (Tar.Next e es) m =
|
||||
| f pkgId ->
|
||||
do
|
||||
putStrLn $ "Found cabal file " ++ pkgIdToString pkgId ++ " with time " ++ show time
|
||||
m' <-
|
||||
M.alterF
|
||||
( \case
|
||||
-- New package
|
||||
Nothing ->
|
||||
let -- new package
|
||||
go Nothing =
|
||||
pure $
|
||||
Just $
|
||||
PackageMeta
|
||||
@ -62,19 +59,17 @@ importIndex f (Tar.Next e es) m =
|
||||
packageForceVersion = False
|
||||
}
|
||||
-- Existing package, new revision
|
||||
Just sm -> do
|
||||
go (Just sm) = do
|
||||
let revnum = 1 + fromMaybe 0 (latestRevisionNumber sm)
|
||||
newRevision = RevisionMeta {revisionNumber = revnum, revisionTimestamp = Just time}
|
||||
-- bad performance here but I don't care
|
||||
-- Repeatedly adding at the end of a list is bad performance but good for the moment.
|
||||
let sm' = sm {packageRevisions = packageRevisions sm ++ [newRevision]}
|
||||
let PackageId pkgName pkgVersion = pkgId
|
||||
let outDir = "_sources" </> pkgName </> pkgVersion </> "revisions"
|
||||
IO.createDirectoryIfMissing True outDir
|
||||
createDirectoryIfMissing True outDir
|
||||
BSL.writeFile (outDir </> show revnum <.> "cabal") contents
|
||||
return $ Just sm'
|
||||
)
|
||||
pkgId
|
||||
m
|
||||
m' <- M.alterF go pkgId m
|
||||
importIndex f es m'
|
||||
_ -> importIndex f es m
|
||||
importIndex _f Tar.Done m =
|
||||
@ -88,7 +83,7 @@ finalise ::
|
||||
IO ()
|
||||
finalise PackageId {pkgName, pkgVersion} meta = do
|
||||
let dir = "_sources" </> pkgName </> pkgVersion
|
||||
IO.createDirectoryIfMissing True dir
|
||||
createDirectoryIfMissing True dir
|
||||
writePackageMeta (dir </> "meta.toml") meta
|
||||
|
||||
isCabalFile ::
|
||||
|
||||
Loading…
Reference in New Issue
Block a user