GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-18 16:29:03 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions
11212 commits 12 branches 166 tags 135 MiB
Commit graph

315 commits

Author SHA1 Message Date
Damien Elmes
a5c728a124 avoid wrapping outermost search in parens 2021-02-12 09:30:21 +10:00
Damien Elmes
28a9ba473d tweak search wording and tidy up API 
- SearchTerm -> SearchNode
- Operator -> Joiner; share between messages
- build_search_string() supports specifying AND/OR as a convenience
- group_searches() makes it easier to negate
 2021-02-11 19:57:19 +10:00
Damien Elmes
6e28b096f8 more search bikeshedding 
While implementing the overdue search, I realised it would be nice to
be able to construct a search string with OR and NOT searches without
having to construct each part individually with build_search_string().

Changes:

- Extends SearchTerm to support a text search, which will be parsed
by the backend. This allows us to do things like wrap text in a group
or NOT node.
- Because SearchTerm->Node conversion can now fail with a parsing error,
it's switched over to TryFrom
- Switch concatenate_searches and replace_search_term to use SearchTerms,
so that they too don't require separate string building steps.
- Remove the unused normalize_search()
- Remove negate_search, as this is now an operation on a Node, and
users can wrap their search in SearchTerm(negated=...)
- Remove the match_any and negate args from build_search_string

Having done all this work, I've just realised that perhaps the original
JSON idea was more feasible than I first thought - if we wrote it out
to a string and re-parsed it, we would be able to leverage the existing
checks that occur at parsing stage.
 2021-02-11 17:11:17 +10:00
Damien Elmes
13da94b4cf switch search parser to using owned values 
I was a bit too enthusiastic with using borrowed values in structs
earlier on in the Rust porting. In this case any performance gains are
dwarfed by the cost of querying the DB, and using owned values here
simplifies the code, and will make it easier to parse a fragment in
the From<SearchTerm> impl.
 2021-02-11 12:19:36 +10:00
Damien Elmes
fd5f4b233f expose the ability to create search groups 2021-02-11 11:21:33 +10:00
Damien Elmes
9b468c81fd Merge pull request #959 from Arthur-Milchior/AGPL 
NF: add AGPL licence missing in some file
 2021-02-01 12:46:59 +10:00
Arthur Milchior
6a1815fd56 NF: add AGPL licence missing in some file 
I noticed it when I looked at some files now used in AnkiDroid, wanting to be sure we clearly indicate that we have
AGPLv3 code linked in the app
 2021-01-31 21:50:21 +01:00
RumovZ
25393466dd Rename EaseKind to RatingKind 2021-01-30 19:03:50 +01:00
RumovZ
d403430846 Fix nid search test 2021-01-28 16:29:34 +01:00
RumovZ
82cfee17d0 Add nid filter on backend 2021-01-28 16:19:55 +01:00
Damien Elmes
4890872c3a fix context in rated: search error message 2021-01-19 18:33:10 +10:00
Damien Elmes
2685e641ee more parsing error tweaks 
The majority of the error checking can now be delegated to routines
like parse_f32(), parse_negative_i32() and so on, instead of creating
specific error messages for each type.
 2021-01-19 15:50:26 +10:00
Damien Elmes
7eb78ecb16 simplify write_props() and associated translations 
This is a work in progress; see associated PR discussion to follow.
 2021-01-19 12:40:16 +10:00
Damien Elmes
d92ba2c246 Merge pull request #900 from abdnh/tagtree 
Hierarchical tags
 2021-01-18 16:36:22 +10:00
Henrik Giesel
232f5b5e79 Adjust unit tests for new InvalidRatedEase 2021-01-18 00:05:20 +01:00
Henrik Giesel
df3995e688 Generalize InvalidRatedEase error for rated and prop:rated 2021-01-17 23:55:05 +01:00
Henrik Giesel
a15ed65b8e Use explicit unreachable in rust pattern matching 2021-01-17 22:18:12 +01:00
Henrik Giesel
6ace112cad Add resched to tags 2021-01-17 21:44:56 +01:00
Henrik Giesel
fb497ea2e6 Reintroduce false removed limits 2021-01-16 17:38:02 +01:00
Henrik Giesel
cb7df2c71f Change argument order of write_rated to be more in line with the logic 2021-01-16 15:24:22 +01:00
Henrik Giesel
915cde892b Lift the 365 limit from rated/resched searches 2021-01-16 15:08:15 +01:00
Henrik Giesel
682ab23482 Fix issues after rebasing 2021-01-16 13:07:35 +01:00
Henrik Giesel
216ca28cb2 Being overly correct with the review ids 2021-01-16 12:45:02 +01:00
Henrik Giesel
ac0c5a1d00 Fix formatting 2021-01-16 12:45:02 +01:00
Henrik Giesel
0c71487973 Pass in the the negative offset day to write_rated 2021-01-16 12:44:59 +01:00
Henrik Giesel
401796ffbe Port prop:rated to EaseKind 2021-01-16 12:44:03 +01:00
Henrik Giesel
c84a75b4a5 Implement functioning prop:rated 2021-01-16 12:42:08 +01:00
Henrik Giesel
6da38dc719 Add nonfunctional "prop:rated" as possible search query 2021-01-16 12:42:06 +01:00
Damien Elmes
96bd39f13e search error tweaks 
- use markdown instead of HTML, to make editing and translating easier
- use a shared prefix
- a few very minor wording tweaks
- we don't need to translate undocumented command errors
- share a string for positive number of days
- share a string for invalid property and state arguments, and avoid
listing them out

Related discussion: https://github.com/ankitects/anki/pull/922
 2021-01-16 15:59:19 +10:00
RumovZ
bdb7948406 Add resched error tests 2021-01-15 10:57:55 +01:00
RumovZ
b9f7643100 Merge branch 'master' into search-errors 
Add error support for new resched node, update rated error.
 2021-01-15 10:50:02 +01:00
RumovZ
9d641bcb76 Include context in search error test 2021-01-15 09:09:54 +01:00
abdo
112aa44c90 Merge branch 'master' of https://github.com/ankitects/anki into tagtree 2021-01-15 01:12:01 +03:00
RumovZ
e0168c8216 Encode HTML entities in search errors 2021-01-14 23:02:39 +01:00
RumovZ
6f8a9ba2ff Add search context for certain error kinds 2021-01-14 22:40:07 +01:00
RumovZ
74c2ce8df1 Rename ParseErrorKind to SearchErrorKind 2021-01-14 22:00:52 +01:00
RumovZ
6cbb4b48b2 Add errorkind test 2021-01-14 19:10:12 +01:00
RumovZ
8c6fbd828d Add FailKinds for unopened/unclosed groups 2021-01-14 19:09:31 +01:00
RumovZ
ae22b78534 Make AnkiError::SearchError work with ParseError 
Use mock ftl strings for now.
 2021-01-14 11:14:55 +01:00
RumovZ
5e971759cf Fix text node parsers, add FailKind alias 2021-01-14 11:10:33 +01:00
RumovZ
6c66da5578 Expect backslashes to be escaped in dupe: text 2021-01-14 10:42:37 +10:00
RumovZ
530cfebe19 Fix writing dupe nodes 
Rename comments and dupe functions on the backend accordingly to avoid
further confusion.
 2021-01-14 10:42:37 +10:00
RumovZ
97ed75a322 Optimise term parsers 2021-01-13 14:15:57 +01:00
RumovZ
5fc24ddfde Move parse errors, add helper func for parse fail 2021-01-13 13:23:25 +01:00
Henrik Giesel
42b10e5a12 Change "between 1 and 4" to "> 0" 2021-01-13 11:44:54 +01:00
Henrik Giesel
28c53a410a Rename EaseKind values 2021-01-13 11:41:48 +01:00
abdo
c423e8d7bb Merge branch 'master' of https://github.com/ankitects/anki into tagtree 2021-01-12 23:31:58 +03:00
abdo
e3c873fb32 Keep tags in human form and update the tags table structure 
See https://github.com/ankitects/anki/pull/900#issuecomment-758284016

- Leave tag names alone and add the collapsed and config columns to the tags table.
- Update The DB check code to preserve the collapse state of used tags.
- Add a simple test for clearing tags and their children
 2021-01-12 23:12:35 +03:00
RumovZ
c9b9c73f5e Fix top-level search errorkinds 2021-01-12 17:32:26 +01:00
RumovZ
c95a592891 Switch parser to custom erros and results 2021-01-12 10:43:12 +01:00
Henrik Giesel
1e74e79a1f Coerce resched:days as well 2021-01-11 17:25:42 +01:00
Henrik Giesel
00acdd3bf7 Satisfy rslib unit tests 2021-01-11 17:18:40 +01:00
Henrik Giesel
fc52046808 Remove EaseKind impl in favor of transforming to sql in function 2021-01-11 17:10:17 +01:00
Henrik Giesel
fe15df1c4f Introduce "resched:n" instead of 0 and a flag for "rated" 2021-01-11 16:40:30 +01:00
Henrik Giesel
08e6f5982e Modify default behavior of rated searches to exclude manual 2021-01-11 16:40:30 +01:00
Damien Elmes
4b98ce0145 Merge pull request #917 from hgiesel/querynozero3 
Coerce added/edited:0 to 1, Constrain rated:n to 1-365
 2021-01-11 16:24:12 +10:00
Henrik Giesel
5b1bf8a10e Fix formatting 2021-01-10 16:38:20 +01:00
Henrik Giesel
40ab80f70e Add a few rslib unit tests 2021-01-10 16:29:10 +01:00
Henrik Giesel
027677ac6d Remove coercion in write_rated 2021-01-10 16:23:53 +01:00
Henrik Giesel
d7513fd33d Coerce added/edited:0 to 1, constrain rated:n to 1 <= 365 2021-01-10 16:16:17 +01:00
Damien Elmes
cbd4439f30 Merge pull request #913 from RumovZ/fix-write-template 
Fix ordinal case in write_template
 2021-01-10 08:58:00 +10:00
RumovZ
0bf7ad0951 Merge branch 'master' into backend-filters 
Adapt new formatting.
 2021-01-09 19:03:43 +01:00
RumovZ
4911757177 Fix ordinal case in write_template 
Internal card ordinals start at 0, so add 1 again when writing a
template search string from a parsed ordinal.
 2021-01-09 17:30:12 +01:00
abdo
a30a2638ce Hierarchical tags 2021-01-09 17:10:13 +03:00
RumovZ
455b693623 Provide filter searches through backend 2021-01-09 10:50:08 +01:00
Damien Elmes
a055663046 reformat .sql files 2021-01-09 14:08:55 +10:00
Damien Elmes
4b9e5f425b Merge pull request #904 from hgiesel/propdue 
Streamlining `is:due`, `prop:due`, and the FutureDue graph
 2021-01-08 16:34:53 +10:00
Henrik Giesel
66da8549cd Add comment about integer division 2021-01-07 20:10:25 +01:00
Henrik Giesel
6f9adbe8fd Restate rslib unit test 2021-01-07 19:56:36 +01:00
Henrik Giesel
8fcf88e606 Search for Learn and PreviewRepeat cards when using prop:due 2021-01-07 19:01:10 +01:00
Henrik Giesel
0d02b1f2f0 Include PreviewRepeat cards in is:due 2021-01-07 17:24:10 +01:00
RumovZ
991a3c1596 Add native enum for concatenate_search's separator 2021-01-07 12:50:57 +01:00
RumovZ
b8f7bb8807 Add Position in PropertyKind match of writer.rs 2021-01-06 23:29:09 +01:00
RumovZ
ac4d254793 Merge branch 'master' of https://github.com/ankitects/anki into norm-search 2021-01-06 20:57:24 +01:00
RumovZ
0b1eec9cd8 Add tests for writer.rs 
Also minor adjustments to concatenate_searches.
 2021-01-06 19:39:34 +01:00
RumovZ
1c257047b6 Implement replace_search_term 2021-01-06 14:03:43 +01:00
RumovZ
5a9e905b22 Implement concatenate_searches 
Fix minor stuff in writer.rs.
 2021-01-06 14:00:47 +01:00
RumovZ
576ffc2b0a Implement negate_search 2021-01-06 13:57:35 +01:00
Henrik Giesel
453dad18fe Change meaning of "is:learn" to filter on type, not queue 2021-01-05 17:36:55 +01:00
abdo
85a1c732db Rename prop:order to prop:pos 2021-01-02 13:35:10 +03:00
abdo
ab8736b37f Support prop:order to search for new cards by order 2021-01-01 04:36:51 +03:00
Damien Elmes
5a87175127 fix clippy error in unit test 2020-12-31 09:48:05 +10:00
RumovZ
6ad500db55 Make function names more explicit and add docs 2020-12-29 11:18:49 +01:00
RumovZ
6a2f1fc6aa Make normalized search syntax more explicit 
Also fix a bug with NoCombining and WordBoundary searches.
 2020-12-29 11:06:53 +01:00
RumovZ
54964c5fa6 Don't escape isolated - 2020-12-22 11:52:17 +01:00
RumovZ
08c77107a0 Fix format and tests 2020-12-22 11:32:53 +01:00
RumovZ
b7d49d26d2 Expose search writer 2020-12-22 11:06:55 +01:00
RumovZ
37c4ac6524 Add search writer 2020-12-22 11:04:38 +01:00
cecini
77a94c8a45 Update rslib dep nom 2020-12-15 08:19:52 +00:00
Damien Elmes
ae742417a1 fix filtered decks not honoring sort order 
https://forums.ankiweb.net/t/2-1-36-filtered-decks-bug/5649/
 2020-12-09 22:50:49 +10:00
Damien Elmes
00f827f976 fix duplicate search not checking first field 
Thanks to abdo for the initial solution. Closes #838
 2020-11-30 09:27:10 +10:00
RumovZ
6c3c617b64 Comment fix 2020-11-27 22:12:36 +01:00
RumovZ
59bbbd53b8 Revert implementation of r: prefix 2020-11-27 22:10:37 +01:00
Damien Elmes
775dae874d fix new Clippy lints 2020-11-25 09:12:19 +10:00
Damien Elmes
29b3ee13e8 fix clippy lints 2020-11-24 20:13:05 +10:00
RumovZ
a6fe08f662 Revert changes to normalisation handling 
Handle norm calls individually in write_search_node_to_sql again.
 2020-11-18 23:46:27 +01:00
RumovZ
6290e09b89 Implement the prefix r: to search for raw input 2020-11-18 22:26:51 +01:00
RumovZ
f05e70a03e Merge branch 'master' into rework-search-parser 
Conflicts:
    rslib/src/search/sqlwriter.rs
 2020-11-18 09:04:04 +01:00
RumovZ
add3fea6c3 Make - escapable 
Treat unescaped - as before but make it escapable with \ to distinguish
the literal from the negator.
 2020-11-17 18:38:27 +01:00
RumovZ
64bf14f1e9 Split unescaping between parser and writer 
* Unescape wildcards in writer instead of parser.
* Move text conversion functions to text.rs.
* Implicitly norm when converting text.
* Revert to using collection when comparing tags but add escape support.
 2020-11-17 12:49:37 +01:00
abdo
35bfd20240 Make dupe search operate on non-stripped text 
See https://github.com/ankitects/anki/pull/822/
 2020-11-16 04:01:04 +03:00
RumovZ
c4bea9e3c0 Use enforced re to parse deck 
Fix write_deck not recognising escaped deck name separators:
\:\: -> ::
 2020-11-15 21:32:36 +01:00
RumovZ
065d9e939b Annotate RegEx for invalid-escape check 2020-11-15 14:22:16 +01:00
RumovZ
e1ddc3d63a Extend tests for new search parsing 
(Also fix indentation)
 2020-11-15 12:00:20 +01:00
RumovZ
6d4d1369d4 Fix escape check for escaped backslash 2020-11-15 11:57:11 +01:00
RumovZ
2e54817870 Move whitespace check for tags from to sqlwriter 
Instead of not parsing a tag containing whitespace, check for spaces
when writing sql and if there are any, explicitly match nothing.
 2020-11-15 11:54:21 +01:00
RumovZ
022efd5956 Always use regex for tag search 
Don't distinguish between the glob and no-glob cases when comparing
tags but always use regexp. Thus, avoid problems with SQL wildcards in
registered tags.
 2020-11-15 09:52:00 +01:00
RumovZ
d65b1f96f7 Fix tests for new search parsing (and reformat) 2020-11-14 19:13:09 +01:00
RumovZ
59f0010783 Fix whitespace in write_tag and parser/whitespac0 2020-11-14 19:10:56 +01:00
RumovZ
baf3dd9dde For deck searches, unescape quotes only 
For now, revert to the old handling of deck names using text_to_re from
text.rs and have parser.rs only unescape quotes.
 2020-11-14 19:06:37 +01:00
RumovZ
c27175238c Fix 'escaped' parser for empty string 
Fix a bug where 'escaped' parsers (nom) accepted the empty
string by wrapping them in 'verify' parsers.
 2020-11-14 18:28:24 +01:00
RumovZ
e09486d088 Fix bugs and inconsistencies in the search parser 2020-11-12 17:27:50 +01:00
Andreas Reis
81d6d21ae3 cleanup / renames 
・ soundRegexps →  sound_regexps

・ htmlRegexps →  html_media_regexps

・ HTML_TAGS →  HTML_MEDIA_TAGS

・ escapeImages →  escape_media_filenames + alias

・ strip_html_preserving_image_filenames →  strip_html_preserving_media_filenames
 2020-11-10 14:53:04 +01:00
Damien Elmes
791894d2d0 fix new clippy lints 2020-10-09 21:35:53 +10:00
Damien Elmes
61bbe6a604 fix * handling in unqualifed text as well 
https://forums.ankiweb.net/t/anki-2-1-desktop-searching-with-only-when-limited-to-a-field/3789/4
 2020-09-29 21:18:19 +10:00
Damien Elmes
2e7c71b415 fix escaping of * in field search 
mentioned in
https://github.com/ankitects/anki/pull/769
 2020-09-27 16:04:08 +10:00
Damien Elmes
4d66bafc51 stop is:due gathering learning cards that are not due yet 
https://forums.ankiweb.net/t/how-to-avoid-rebuilding-filtered-decks-to-skip-learning-cards-steps/3551/
 2020-09-21 11:41:54 +10:00
Damien Elmes
f32d773e25 set_deck() 2020-09-03 17:42:46 +10:00
Damien Elmes
f7d4bf8489 support did:[deck id] search 2020-09-03 16:43:22 +10:00
Damien Elmes
7c169daa95 move card sorting and resetting to backend 2020-09-03 15:54:15 +10:00
Damien Elmes
396081d329 move filtered deck empty/fill to backend 
emptying of individual card ids still to be done
 2020-09-02 17:56:23 +10:00
Damien Elmes
988b3c00c1 move unbury/unsuspend routines into backend 2020-09-01 10:24:38 +10:00
Damien Elmes
4894025cfc add separate sched/user bury searches, and fix bury enums 2020-09-01 10:24:38 +10:00
Damien Elmes
b9f6bde2dc catch leading/trailing boolean operators 
https://forums.ankiweb.net/t/is-it-only-me-anki-giving-corrupt-collection-error/2424/20
 2020-08-27 09:59:29 +10:00
Damien Elmes
cb821a9e3c fix globs not working in bulk tag add/remove 2020-08-17 18:14:00 +10:00
Damien Elmes
3da7884e19 reject double comma in id list 
https://forums.ankiweb.net/t/anki-2-1-29-and-below-2-small-bugs/1496
 2020-07-29 13:05:34 +10:00
Damien Elmes
d35bc85ead is:review should include relearning cards 
https://forums.ankiweb.net/t/anki-2-1-28-beta/629/36

This issue appears to have existed since the V2 scheduler was
introduced - the old Python search code was ignoring Relearn as well.
 2020-07-09 11:07:50 +10:00
Damien Elmes
8cfafdbc32 supported edited:n 
https://forums.ankiweb.net/t/feature-request-advanced-broswer-search-by-edited/268
 2020-07-01 10:17:57 +10:00
Damien Elmes
06d9f64dea lint fixes 2020-06-29 15:53:56 +10:00
Damien Elmes
4be8e7923a fix partially quoted text not handling escaped quotes 
https://forums.ankiweb.net/t/how-to-search-for-cards-containing-quotes/500/10
 2020-06-29 15:48:01 +10:00
Damien Elmes
4d88b6521d cards added graph 2020-06-29 15:48:01 +10:00
Damien Elmes
1e9901e9bd experiment with exposing raw card/revlog data to frontend 2020-06-29 15:48:00 +10:00
Damien Elmes
6d7be475e6 catch invalid regex in search 
https://github.com/ankitects/anki/pull/652
 2020-06-09 11:46:07 +10:00
Damien Elmes
c78e8425aa automatically omit notes or cards table when possible 2020-05-19 11:27:02 +10:00
Damien Elmes
c77bc74a2b rename SortMode arg to match enum 2020-05-12 21:13:34 +10:00
Damien Elmes
0a87b1ef2c support disabling unicode normalization in notes 2020-05-12 21:13:34 +10:00
Damien Elmes
7ef72aba04 use the backend for the deck due tree 
- approx 3x faster on a large test deck
- counts are no longer capped to 1000 in the tree
 2020-05-12 21:13:33 +10:00
Damien Elmes
46e0469991 rework aux table sorting 
Instead of inserting text into the aux table and sorting on the fly
(which does a binary sort), we insert the ids in unicase-sorted order,
and then sort based on the automatically assigned rowids - giving
us faster sorts, and proper unicase folding.
 2020-05-12 21:13:33 +10:00
Damien Elmes
c727a9e3f1 fix case sensitivity of notetype/template searches 2020-05-12 21:13:33 +10:00
Damien Elmes
c9db36bc82 update searching code to use decks table 2020-05-12 21:13:33 +10:00
Damien Elmes
24ef0cc6f1 add separate decks table, and start on moving deck handling to Rust 
The Python tests are passing, but there are still a number of issues
to work through, and the table/protobuf schema is not yet finalized.
 2020-05-12 21:13:33 +10:00
Damien Elmes
d810ba5db9 template changes and card generation 
Cloze cards are not yet supported, missing decks are not handled,
and more testing is still required.
 2020-05-12 21:13:33 +10:00
Damien Elmes
0c8763edf3 cache notetypes 2020-05-12 21:13:33 +10:00
Damien Elmes
6e554e6585 add separate search_notes_only() 2020-05-12 21:13:33 +10:00
Damien Elmes
cbb76290c2 start work on field changes, and add search_cards to col 2020-05-12 21:13:33 +10:00
Damien Elmes
638e69af91 move note db code to storage 2020-05-12 21:13:33 +10:00
Damien Elmes
91767fc87b native struct for NoteField 
ord is made optional so we can keep track of changes in the future
 2020-05-12 21:13:33 +10:00
Damien Elmes
9c41210cf4 use native struct for NoteType 2020-05-12 21:13:33 +10:00
Damien Elmes
96300f5858 migrate the schema11 usages to new structs/sql queries 2020-05-12 21:13:33 +10:00
Damien Elmes
4b39a8b727 move schema11 note type code into separate file 2020-05-12 21:13:33 +10:00