findkeys: Support --largerthan and --smallerthan

Sponsored-by: Brett Eisenberg on Patreon

diff --git a/CHANGELOG b/CHANGELOG
index 4ca82dcea0960e0835ec268d6a7febd2b6b74b7f..1bb37b85f356f7aecfd9306f12b302194249a646 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -20,6 +20,7 @@ git-annex (10.20230927) UNRELEASED; urgency=medium
   * Fix bug in git-annex copy --from --to that skipped files that were
     locally present.
   * Make git-annex copy --from --to --fast actually fast.
+  * findkeys: Support --largerthan and --smallerthan.
 
  -- Joey Hess <id@joeyh.name>  Tue, 10 Oct 2023 13:17:31 -0400
 

diff --git a/CmdLine/GitAnnex/Options.hs b/CmdLine/GitAnnex/Options.hs
index 92649fae346c278cd17ea150dec2aabfebd70ece..b5170f3131a61b87c7d352c5d36c291494326535 100644 (file)
--- a/CmdLine/GitAnnex/Options.hs
+++ b/CmdLine/GitAnnex/Options.hs
@@ -266,6 +266,7 @@ annexedMatchingOptions = concat
 keyMatchingOptions :: [AnnexOption]
 keyMatchingOptions = concat
        [ keyMatchingOptions'
+       , sizeMatchingOptions Limit.LimitAnnexFiles
        , anythingNothingOptions
        , combiningOptions 
        , timeLimitOption 
@@ -398,7 +399,11 @@ fileMatchingOptions' lb =
                <> help "limit to files whose content is the same as another file matching the glob pattern"
                <> hidden
                )
-       , annexOption (setAnnexState . Limit.addLargerThan lb) $ strOption
+       ] ++ sizeMatchingOptions lb
+
+sizeMatchingOptions :: Limit.LimitBy -> [AnnexOption]
+sizeMatchingOptions lb =
+       [ annexOption (setAnnexState . Limit.addLargerThan lb) $ strOption
                ( long "largerthan" <> metavar paramSize
                <> help "match files larger than a size"
                <> hidden

diff --git a/doc/bugs/git-annex_findkeys_does_not_know_--largerthan.mdwn b/doc/bugs/git-annex_findkeys_does_not_know_--largerthan.mdwn
index 9894921581401b812a19703795e0bba7b03085bf..591564f055504d2c00e2a5a96d8ee33b758e2005 100644 (file)
--- a/doc/bugs/git-annex_findkeys_does_not_know_--largerthan.mdwn
+++ b/doc/bugs/git-annex_findkeys_does_not_know_--largerthan.mdwn
@@ -46,3 +46,5 @@ as if I have misspelled the option:
 
 I am using it for my research project (data science/predictions in plant breeding) and it allows me to keep track of the
 current model iteration and associated results. Thank you for this! 
+
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/git-annex_findkeys_does_not_know_--largerthan/comment_1_f6484f69669439ef49513b84d3bd91cf._comment b/doc/bugs/git-annex_findkeys_does_not_know_--largerthan/comment_1_f6484f69669439ef49513b84d3bd91cf._comment
new file mode 100644 (file)
index 0000000..05ea2c9
--- /dev/null
+++ b/doc/bugs/git-annex_findkeys_does_not_know_--largerthan/comment_1_f6484f69669439ef49513b84d3bd91cf._comment
@@ -0,0 +1,12 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2023-11-28T15:48:09Z"
+ content="""
+Not all options in git-annex-matching-options can be used by findkeys. It
+mentions this when it says "Some of these options can also be used by
+commands to specify which keys they act on."
+
+However in this case, --largerthan and --smallerthan could in fact be made
+to operate on keys, and I've done so.
+"""]]