From 2bfe760a714b30041d7ee9cb9a8050321306d07a Mon Sep 17 00:00:00 2001 From: Dmitry Zuikov Date: Tue, 10 Sep 2024 10:03:38 +0300 Subject: [PATCH] wip --- .fixme-new/config | 6 ------ fixme-new/fixme.cabal | 1 - fixme-new/lib/Fixme/Log.hs | 31 --------------------------- fixme-new/lib/Fixme/Run.hs | 8 ------- fixme-new/lib/Fixme/Run/Internal.hs | 1 - fixme-new/lib/Fixme/RunOld.hs | 1 - fixme-new/lib/Fixme/Scan/Git/Local.hs | 19 ---------------- hbs2-tests/hbs2-tests.cabal | 4 ---- 8 files changed, 71 deletions(-) delete mode 100644 fixme-new/lib/Fixme/Log.hs diff --git a/.fixme-new/config b/.fixme-new/config index 51db0bd4..915d2f56 100644 --- a/.fixme-new/config +++ b/.fixme-new/config @@ -9,12 +9,8 @@ fixme-prefix TODO: fixme-prefix PR: fixme-prefix REVIEW: -fixme-git-scan-filter-days 30 - fixme-attribs assigned workflow type -fixme-attribs resolution cat scope - fixme-value-set workflow new backlog wip test fixed done ; fixme-value-set cat bug feat refactor @@ -58,7 +54,5 @@ fixme-comments ";" "--" (define (lss s) (report workflow ~ s)) -(define (stage) (fixme:stage:show)) - (refchan 3WtddmcE8zzgBAPR7Bu7mKMaVMTN423NNXSPUJp3Hx42) diff --git a/fixme-new/fixme.cabal b/fixme-new/fixme.cabal index 98f19070..66e23c71 100644 --- a/fixme-new/fixme.cabal +++ b/fixme-new/fixme.cabal @@ -112,7 +112,6 @@ library Fixme Fixme.Config Fixme.Run - Fixme.Log Fixme.Types Fixme.Prelude Fixme.State diff --git a/fixme-new/lib/Fixme/Log.hs b/fixme-new/lib/Fixme/Log.hs deleted file mode 100644 index 47b6f1cd..00000000 --- a/fixme-new/lib/Fixme/Log.hs +++ /dev/null @@ -1,31 +0,0 @@ -module Fixme.Log where - -import Fixme.Prelude -import Fixme.Types - -import HBS2.Storage.Compact - -import Data.Config.Suckless - -import Data.ByteString.Lazy qualified as LBS -import Data.Maybe -import Data.Either - -{- HLINT ignore "Functor law"-} - -loadAllEntriesFromLog :: FixmePerks m - => CompactStorage HbSync - -> FixmeM m [Syntax C] -loadAllEntriesFromLog sto = do - ks <- keys sto - - entries <- mapM (get sto) ks - <&> catMaybes - <&> fmap (deserialiseOrFail @CompactAction . LBS.fromStrict) - <&> rights - - let top = show $ vcat (fmap pretty entries) - let theLog = parseTop top & fromRight mempty - - pure theLog - diff --git a/fixme-new/lib/Fixme/Run.hs b/fixme-new/lib/Fixme/Run.hs index 9c522678..5eac98b2 100644 --- a/fixme-new/lib/Fixme/Run.hs +++ b/fixme-new/lib/Fixme/Run.hs @@ -8,7 +8,6 @@ import Fixme.State import Fixme.Run.Internal import Fixme.Scan.Git.Local as Git import Fixme.Scan as Scan -import Fixme.Log import Data.Config.Suckless.Script.File @@ -222,13 +221,6 @@ runTop forms = do _ -> throwIO $ BadFormException @C nil - entry $ bindMatch "fixme-git-scan-filter-days" $ nil_ \case - [LitIntVal d] -> do - t <- lift $ asks fixmeEnvGitScanDays - atomically (writeTVar t (Just d)) - - _ -> throwIO $ BadFormException @C nil - entry $ bindMatch "fixme-attribs" $ nil_ \case StringLikeList xs -> do ta <- lift $ asks fixmeEnvAttribs diff --git a/fixme-new/lib/Fixme/Run/Internal.hs b/fixme-new/lib/Fixme/Run/Internal.hs index 778dcd4c..f1ee0450 100644 --- a/fixme-new/lib/Fixme/Run/Internal.hs +++ b/fixme-new/lib/Fixme/Run/Internal.hs @@ -9,7 +9,6 @@ import Fixme.Config import Fixme.State import Fixme.Scan.Git.Local as Git import Fixme.Scan as Scan -import Fixme.Log import HBS2.Git.Local.CLI diff --git a/fixme-new/lib/Fixme/RunOld.hs b/fixme-new/lib/Fixme/RunOld.hs index 0e60747b..14e5db1f 100644 --- a/fixme-new/lib/Fixme/RunOld.hs +++ b/fixme-new/lib/Fixme/RunOld.hs @@ -10,7 +10,6 @@ import Fixme.Config import Fixme.State import Fixme.Scan.Git.Local as Git import Fixme.Scan as Scan -import Fixme.Log import HBS2.Git.Local.CLI diff --git a/fixme-new/lib/Fixme/Scan/Git/Local.hs b/fixme-new/lib/Fixme/Scan/Git/Local.hs index 3f07cfe2..5d2910d5 100644 --- a/fixme-new/lib/Fixme/Scan/Git/Local.hs +++ b/fixme-new/lib/Fixme/Scan/Git/Local.hs @@ -9,7 +9,6 @@ import Fixme.Prelude hiding (indent) import Fixme.Types import Fixme.State import Fixme.Scan as Scan -import Fixme.Log import HBS2.Storage import HBS2.Storage.Compact @@ -51,24 +50,6 @@ import Data.Map qualified as Map import Streaming.Prelude qualified as S -data ScanGitArgs = - PrintBlobs - | PrintFixme - | ScanRunDry - | ScanAllCommits - deriving stock (Eq,Ord,Show,Data,Generic) - -pattern ScanGitArgs :: forall {c} . ScanGitArgs -> Syntax c -pattern ScanGitArgs w <- ( scanGitArg -> Just w ) - -scanGitArg :: Syntax c -> Maybe ScanGitArgs -scanGitArg = \case - SymbolVal "print-blobs" -> Just PrintBlobs - SymbolVal "print-fixme" -> Just PrintFixme - SymbolVal "dry" -> Just ScanRunDry - SymbolVal "all-commits" -> Just ScanAllCommits - _ -> Nothing - {- HLINT ignore "Functor law" -} diff --git a/hbs2-tests/hbs2-tests.cabal b/hbs2-tests/hbs2-tests.cabal index 8e607b09..e8a7d573 100644 --- a/hbs2-tests/hbs2-tests.cabal +++ b/hbs2-tests/hbs2-tests.cabal @@ -128,7 +128,6 @@ executable test-udp -- other-extensions: - -- type: exitcode-stdio-1.0 hs-source-dirs: test main-is: TestUDP.hs @@ -866,7 +865,6 @@ executable test-notify -- other-extensions: - type: exitcode-stdio-1.0 hs-source-dirs: test/notify-unix main-is: Main.hs build-depends: @@ -910,7 +908,6 @@ executable test-playground -- other-extensions: - type: exitcode-stdio-1.0 hs-source-dirs: test/playground main-is: Main.hs build-depends: @@ -961,7 +958,6 @@ executable test-pipe-mess -- other-extensions: - type: exitcode-stdio-1.0 hs-source-dirs: test main-is: TestPipeMessaging.hs build-depends: