From 0d798fd742ac06a7311a548a63ff060bce927ad5 Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Wed, 12 Jun 2024 15:56:30 +0300 Subject: [PATCH] wip, refactor --- .fixme-new/config | 12 ++++-------- .fixme-new/fixme.log | Bin 459461 -> 460056 bytes fixme-new/lib/Fixme/Run.hs | 9 +++++---- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.fixme-new/config b/.fixme-new/config index 4694309c..e0b7b243 100644 --- a/.fixme-new/config +++ b/.fixme-new/config @@ -30,19 +30,15 @@ fixme-file-comments "*.scm" ";" fixme-comments ";" "--" -;(fixme-play-log-action -; (import ".fixme-new/log") -;) - -(fixme-play-log-action - (play-git-log-file-all ".fixme-new/log") +(update-action + (import-git-logs ".fixme-new/log") ) -(fixme-play-log-action +(update-action (export ".fixme-new/fixme.log") ) -(fixme-play-log-action +(update-action (hello kitty) ) diff --git a/.fixme-new/fixme.log b/.fixme-new/fixme.log index 35eff7877edb3f7b2f5b6447d4dd7e95ccd10f28..7da3954448ce306dc989fd564eafb5f750a54045 100644 GIT binary patch delta 513 zcmX@wDl?-?rlEzgg{g(Pg{6hHg>4J_Q6?t_5MXDX-OM1BmN_e^iJ^%hLgCS|@E3Y* zoc|ev?fbrG@0z_rHma$P>(QdV)J1}-m!9gPD4wpqo=s8Gq7A51ih-T!R}+JTF2k1y zbr*-FoHP?+XP#n0;L}eRygpyl zUMTIS{E**s%8Q`8b0_TE!{X{H)XO0RQN0MFdKK@wKhCatHY=B@pa0|>`~151#(iS? zvs;yI7XDt~XrqCmc>1w#NWNu}Me`0=8tz->4`|YatYUzL6Z2s-ofuw1^ARGPn0Jdn N1H}tSGeg+SvjLrjrbPe% delta 23 ecmbQyC3Cb@rlEzgg{g(Pg{6hHg>4J_Q6>Op$_LZ{ diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 0c0ebecc..282eabf1 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -328,6 +328,7 @@ exportToLog fn = do compactStorageClose sto + cleanStage importFromLog :: FixmePerks m => CompactStorage HbSync -> FixmeM m () importFromLog sto = do @@ -624,15 +625,15 @@ runForms ss = for_ ss $ \s -> do atomically $ modifyTVar t (<> [action]) - ListVal (SymbolVal "fixme-play-log-action" : xs) -> do - debug $ "fixme-play-log-action" <+> pretty xs + ListVal (SymbolVal "update-action" : xs) -> do + debug $ "update-action" <+> pretty xs env <- ask t <- asks fixmeEnvReadLogActions let action = ReadLogAction @c $ \_ -> liftIO (withFixmeEnv env (runForms xs)) atomically $ modifyTVar t (<> [action]) - ListVal [SymbolVal "play-git-log-file-all", StringLike fn] -> do - warn $ red "play-git-log-file-all" <+> pretty fn + ListVal [SymbolVal "import-git-logs", StringLike fn] -> do + warn $ red "import-git-logs" <+> pretty fn scanGitLogLocal fn importFromLog ListVal [SymbolVal "import", StringLike fn] -> do