2.0 -- yaml export fixes, dayone fixes #349

Merged
merged 13 commits into from May 6, 2015

Conversation

Projects
None yet
3 participants
@MinchinWeb
Collaborator

MinchinWeb commented May 5, 2015

This pull request fixes/adds:

  • shlex.split on Windows (fixes #322, fixes #348)
  • CLI
    • if no editor is set, running jrnl allows you to create an entry, but no prompt was being given
    • colorizes warning and error messages throughout
  • improves Dayone handling:
    • moves to new-style date handling (variable length, square bracket enclosed)
  • improves YAML export handling
    • only increases headings by one level
    • includes the entry's UUID (if available) in the export
    • removes lines from the entry if they only list tags
@maebert

This comment has been minimized.

Show comment
Hide comment
@maebert

maebert May 6, 2015

Owner

dis gon b gud

Wow. So much goodness in here indeed. Merging it in now, thank you!

Owner

maebert commented May 6, 2015

dis gon b gud

Wow. So much goodness in here indeed. Merging it in now, thank you!

maebert added a commit that referenced this pull request May 6, 2015

Merge pull request #349 from MinchinWeb/2.0-yaml-export-fixes
2.0 -- yaml export fixes, dayone fixes

@maebert maebert merged commit 8a6563d into maebert:2.0-rc1 May 6, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@MinchinWeb MinchinWeb deleted the MinchinWeb:2.0-yaml-export-fixes branch May 10, 2015

@MinchinWeb

This comment has been minimized.

Show comment
Hide comment
@MinchinWeb

MinchinWeb May 10, 2015

Collaborator

@maebert , your responses get better and better! Glad to help

Collaborator

MinchinWeb commented May 10, 2015

@maebert , your responses get better and better! Glad to help

@flight16

This comment has been minimized.

Show comment
Hide comment
@flight16

flight16 Jun 1, 2015

There was a discussion on this commit over at my fork, but I'm moving it back to this repo.

@flight16 because it wasn't working the way I wanted it to. It would add this metadata to all entries that jrnl edited, rather than just the entries that lacked it. In a nutshell, jrnl was throwing away all existing metadata. I would like jrnl to keep existing metadata on entries. This is a feature I intend to come back to.

I think this is what caused #358, but I haven't had the time to verify.

There was a discussion on this commit over at my fork, but I'm moving it back to this repo.

@flight16 because it wasn't working the way I wanted it to. It would add this metadata to all entries that jrnl edited, rather than just the entries that lacked it. In a nutshell, jrnl was throwing away all existing metadata. I would like jrnl to keep existing metadata on entries. This is a feature I intend to come back to.

I think this is what caused #358, but I haven't had the time to verify.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment