mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-10 08:38:32 +02:00
Allow searching directory journal for markdown files. Partial fix for #1289.
This commit is contained in:
parent
75b703d39f
commit
628edd0399
1 changed files with 6 additions and 3 deletions
|
@ -4,6 +4,7 @@
|
||||||
import codecs
|
import codecs
|
||||||
import os
|
import os
|
||||||
import pathlib
|
import pathlib
|
||||||
|
import re
|
||||||
from typing import TYPE_CHECKING
|
from typing import TYPE_CHECKING
|
||||||
|
|
||||||
from jrnl import time
|
from jrnl import time
|
||||||
|
@ -17,7 +18,7 @@ if TYPE_CHECKING:
|
||||||
DIGIT_PATTERN = "[0123456789]"
|
DIGIT_PATTERN = "[0123456789]"
|
||||||
YEAR_PATTERN = DIGIT_PATTERN * 4
|
YEAR_PATTERN = DIGIT_PATTERN * 4
|
||||||
MONTH_PATTERN = "[01]" + DIGIT_PATTERN
|
MONTH_PATTERN = "[01]" + DIGIT_PATTERN
|
||||||
DAY_PATTERN = "[0123]" + DIGIT_PATTERN + ".txt"
|
DAY_PATTERN = "[0-3][0-9].(txt|md)"
|
||||||
|
|
||||||
|
|
||||||
class Folder(Journal):
|
class Folder(Journal):
|
||||||
|
@ -144,9 +145,11 @@ class Folder(Journal):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _get_day_files(path: pathlib.Path) -> list[str]:
|
def _get_day_files(path: pathlib.Path) -> list[str]:
|
||||||
for child in path.glob(DAY_PATTERN):
|
for child in path.iterdir():
|
||||||
|
match = re.search(DAY_PATTERN, str(child))
|
||||||
if (
|
if (
|
||||||
int(child.stem) > 0
|
match is not None
|
||||||
|
and int(child.stem) > 0
|
||||||
and int(child.stem) <= 31
|
and int(child.stem) <= 31
|
||||||
and time.is_valid_date(
|
and time.is_valid_date(
|
||||||
year=int(path.parent.name),
|
year=int(path.parent.name),
|
||||||
|
|
Loading…
Add table
Reference in a new issue