mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

really add non-date metadata too

Browse source
This commit is contained in:
Joey Hess 2014-07-03 14:35:20 -04:00
parent 4565b5263d
commit fc80956092
Failed to extract signature
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Annex/MetaData.hs
View file

@ -7,7 +7,7 @@
module Annex.MetaData ( module Annex.MetaData (
genMetaData, genMetaData,
addDateMetaData, dateMetaData,
module X module X
) where ) where
@ -39,14 +39,14 @@ genMetaData key file status = do
maybe noop (flip copyMetaData key) =<< catKeyFileHEAD file maybe noop (flip copyMetaData key) =<< catKeyFileHEAD file
whenM (annexGenMetaData <$> Annex.getGitConfig) $ do whenM (annexGenMetaData <$> Annex.getGitConfig) $ do
curr <- getCurrentMetaData key curr <- getCurrentMetaData key
addMetaData key (addDateMetaData mtime curr) addMetaData key (dateMetaData mtime curr)
where where
mtime = posixSecondsToUTCTime $ realToFrac $ modificationTime status mtime = posixSecondsToUTCTime $ realToFrac $ modificationTime status
{- Generates metadata for a file's date stamp. {- Generates metadata for a file's date stamp.
- Does not overwrite any existing metadata values. -} - Does not overwrite any existing metadata values. -}
addDateMetaData :: UTCTime -> MetaData -> MetaData dateMetaData :: UTCTime -> MetaData -> MetaData
addDateMetaData mtime old = MetaData $ M.fromList $ filter isnew dateMetaData mtime old = MetaData $ M.fromList $ filter isnew
[ (yearMetaField, S.singleton $ toMetaValue $ show y) [ (yearMetaField, S.singleton $ toMetaValue $ show y)
, (monthMetaField, S.singleton $ toMetaValue $ show m) , (monthMetaField, S.singleton $ toMetaValue $ show m)
] ]

2
Command/ImportFeed.hs
View file

@ -228,7 +228,7 @@ feedFile tmpl i extension = Utility.Format.format tmpl $
extractMetaData :: ToDownload -> MetaData extractMetaData :: ToDownload -> MetaData
extractMetaData i = case getItemPublishDate (item i) :: Maybe (Maybe UTCTime) of extractMetaData i = case getItemPublishDate (item i) :: Maybe (Maybe UTCTime) of
Just (Just d) -> addDateMetaData d meta Just (Just d) -> unionMetaData meta (dateMetaData d meta)
_ -> meta _ -> meta
where where
tometa (k, v) = (mkMetaFieldUnchecked k, S.singleton (toMetaValue v)) tometa (k, v) = (mkMetaFieldUnchecked k, S.singleton (toMetaValue v))