Skip to content

Fix duplicate text export filenames #2127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
davidlarteyo49 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix duplicate text export filenames #2127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions jrnl/plugins/text_exporter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,12 @@ def write_files(cls, journal: "Journal", path: str) -> str:
entry_is_written = False
while not entry_is_written:
full_path = os.path.join(path, cls.make_filename(entry))
if os.path.exists(full_path):
base, extension = os.path.splitext(full_path)
counter = 2
while os.path.exists(f"{base}_{counter}{extension}"):
counter += 1
full_path = f"{base}_{counter}{extension}"
try:
with open(full_path, "w", encoding="utf-8") as f:
f.write(cls.export_entry(entry))
Expand Down
13 changes: 13 additions & 0 deletions tests/bdd/features/format.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,19 @@ Feature: Custom formats
When we run "jrnl --format markdown --file {cache_dir}"
Then the cache directory should contain 5 files
And we should get no error

Scenario: Export entries with identical dates and titles
Given we use the config "basic_onefile.yaml"
And we create a cache directory
When we run "jrnl 2020-10-20 01:00: same title"
When we run "jrnl 2020-10-20 02:00: same title"
When we run "jrnl --format text --file {cache_dir}"
Then the cache directory should contain the files
"""
2020-10-20_same-title.txt
2020-10-20_same-title_2.txt
"""
And we should get no error

Scenario: Export entries in text format with a title longer than max file name length.
Given we use the config "basic_onefile.yaml"
Expand Down