diff --git a/.fixme-new/log b/.fixme-new/log index f1774227..ab43f881 100644 --- a/.fixme-new/log +++ b/.fixme-new/log @@ -1,7 +1,3 @@ -deleted "6R2raAzjbViHZVk24zwUr7rwgfepHTdXeW6Lbqw3q25A" -deleted "DtcQir9mHe7R5ixYGXTbsXGPeVGV8TqAMmrvYgGy1wGB" -modified "2XpT9uxrz3yu9jtYtu46jfs8ZFr8s3PVAZREJWTCSdYx" "workflow" "done" -modified 0 "2XpT9uxrz3yu9jtYtu46jfs8ZFr8s3PVAZREJWTCSdYx" "workflow" "done" -modified "2XpT9uxrz3yu9jtYtu46jfs8ZFr8s3PVAZREJWTCSdYx" "workflow" "done" -modified "2XpT9uxrz3yu9jtYtu46jfs8ZFr8s3PVAZREJWTCSdYx" "workflow" "done" -modified "2XpT9uxrz3yu9jtYtu46jfs8ZFr8s3PVAZREJWTCSdYx" "workflow" "backlog" +modified 1716433451 "2piRBmaQkb3c2nAcH6Mrf8EAddNJF34c6Tm8PWnbVBqN" "workflow" "done" +deleted "9m2B74CHFTGBTWXo1uNoi9StuQ3AxnMpULwbLcToMkmZ" +deleted "EUP5zeroTKWuP96dQQrZVZqUhBXdh8icD3P9EebYo9HR" diff --git a/fixme-new/fixme.cabal b/fixme-new/fixme.cabal index ce1b62ed..5e11968b 100644 --- a/fixme-new/fixme.cabal +++ b/fixme-new/fixme.cabal @@ -110,7 +110,6 @@ library Fixme.Prelude Fixme.State Fixme.Scan - Fixme.Scan.Git Fixme.Scan.Git.Local build-depends: base diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 3d683708..335ce4c1 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -271,10 +271,12 @@ modify_ :: FixmePerks m => Text -> String -> String -> FixmeM m () modify_ txt a b = do acts <- asks fixmeEnvUpdateActions >>= readTVarIO + ts <- getEpoch + void $ runMaybeT do ha <- toMPlus =<< lift (selectFixmeHash txt) - let syn = mkLit @Text [qc|modified "{pretty ha}" "{a}" "{b}"|] + let syn = mkLit @Text [qc|modified {ts} "{pretty ha}" "{a}" "{b}"|] debug $ red $ pretty syn diff --git a/fixme-new/lib/Fixme/Scan/Git.hs b/fixme-new/lib/Fixme/Scan/Git.hs deleted file mode 100644 index ca630ee8..00000000 --- a/fixme-new/lib/Fixme/Scan/Git.hs +++ /dev/null @@ -1,12 +0,0 @@ -module Fixme.Scan.Git where - -import Fixme.Types - -import HBS2.Git.Local - - -scanForFixmies :: FixmePerks m => Maybe FilePath -> m [Fixme] -scanForFixmies _ = do - pure mempty - - diff --git a/fixme-new/lib/Fixme/State.hs b/fixme-new/lib/Fixme/State.hs index f212adf5..e12d03d6 100644 --- a/fixme-new/lib/Fixme/State.hs +++ b/fixme-new/lib/Fixme/State.hs @@ -543,5 +543,10 @@ updateIndexes = withState $ transactional do select distinct fixme from fixmeactualview |] updateFixmeJson + -- FIXME: delete-table-grows + -- надо добавлять статус в fixmedeleted + -- только если он отличается от последнего + -- известного статуса + update_ [qc|delete from fixmejson where fixme in (select distinct id from fixmedeleted)|]