Merge pull request #27 from RhetTbull/bug_ventura_account_26

Bug ventura account 26

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.1
+current_version = 0.5.2
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
 serialize = {major}.{minor}.{patch}
 

macnotesapp/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"

macnotesapp/cli/cli_config.py

@@ -1,8 +1,9 @@
 """Simple config loader/writer for macnotesapp CLI"""
 
+from __future__ import annotations
+
 import os
 import pathlib
-from typing import Dict
 
 import toml
 
@@ -20,20 +21,29 @@
 DEFAULT_EDITOR = "$EDITOR"
 
 
+def fix_unicode(text: str) -> str:
+    """Fix unicode characters in text that on Ventura cause toml.dump to treat str as a list (#26)"""
+    return text.encode("utf-8").decode()
+
+
 class ConfigSettings:
     config_file = CONFIG_FILE
 
     def __init__(self):
         if not self.config_file.is_file():
             self._create_config_file()
 
-    def read(self) -> Dict:
+    def read(self) -> dict[str, str]:
         """Read data from config file"""
         data = toml.load(self.config_file)
-        return data.get("defaults", dict())
+        return data.get("defaults", {})
 
-    def write(self, settings: Dict):
+    def write(self, settings: dict[str, str]):
         """Write settings dict to config file"""
+        # on Ventura, unicode encoding can cause toml.dump to treat str as a list (#26)
+        settings = {
+            k: fix_unicode(v) if isinstance(v, str) else v for k, v in settings.items()
+        }
         data = {"defaults": settings}
         if not self.config_file.is_file():
             self._create_config_file()

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "macnotesapp"
-version = "0.5.1"
+version = "0.5.2"
 description = "Work with Apple MacOS Notes.app from the command line. Also includes python interface for scripting Notes.app from your own python code."
 authors = ["Rhet Turnbull <[email protected]>"]
 license = "MIT License"
@@ -10,7 +10,7 @@ repository = "https://github.com/RhetTbull/macnotesapp"
 keywords = ["cli", "mac", "macos"]
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.9,<3.12" # pyinstaller requires python < 3.12
 py-applescript = "^1.0.3"
 click = "^8.1.2"
 rich = "^12.4.4"
@@ -21,7 +21,6 @@ wheel = "^0.37.1"
 readability-lxml = "^0.8.1"
 requests = "^2.28.1"
 validators = "^0.20.0"
-textual = "^0.8.1"
 markdownify = "^0.11.6"
 pyobjc-framework-ScriptingBridge = "^9.0.1"
 

site/reference/index.html

@@ -3032,8 +3032,8 @@ <h2 id="macnotesapp.notesapp.Account.id" class="doc doc-heading">
 <code class="highlight language-python"><span class="nb">id</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-property"><code>property</code></small>
       <small class="doc doc-label doc-label-cached"><code>cached</code></small>
+      <small class="doc doc-label doc-label-property"><code>property</code></small>
   </span>
 
 </h2>
@@ -3868,8 +3868,8 @@ <h2 id="macnotesapp.notesapp.Folder.id" class="doc doc-heading">
 <code class="highlight language-python"><span class="nb">id</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-property"><code>property</code></small>
       <small class="doc doc-label doc-label-cached"><code>cached</code></small>
+      <small class="doc doc-label doc-label-property"><code>property</code></small>
   </span>
 
 </h2>
@@ -4346,8 +4346,8 @@ <h2 id="macnotesapp.notesapp.Note.body" class="doc doc-heading">
 <code class="highlight language-python"><span class="n">body</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-writable"><code>writable</code></small>
       <small class="doc doc-label doc-label-property"><code>property</code></small>
+      <small class="doc doc-label doc-label-writable"><code>writable</code></small>
   </span>
 
 </h2>
@@ -4410,8 +4410,8 @@ <h2 id="macnotesapp.notesapp.Note.id" class="doc doc-heading">
 <code class="highlight language-python"><span class="nb">id</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-property"><code>property</code></small>
       <small class="doc doc-label doc-label-cached"><code>cached</code></small>
+      <small class="doc doc-label doc-label-property"><code>property</code></small>
   </span>
 
 </h2>
@@ -4453,8 +4453,8 @@ <h2 id="macnotesapp.notesapp.Note.name" class="doc doc-heading">
 <code class="highlight language-python"><span class="n">name</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-writable"><code>writable</code></small>
       <small class="doc doc-label doc-label-property"><code>property</code></small>
+      <small class="doc doc-label doc-label-writable"><code>writable</code></small>
   </span>
 
 </h2>
@@ -5421,8 +5421,8 @@ <h2 id="macnotesapp.notesapp.Attachment.id" class="doc doc-heading">
 <code class="highlight language-python"><span class="nb">id</span><span class="p">:</span> <span class="nb">str</span></code>
 
   <span class="doc doc-labels">
-      <small class="doc doc-label doc-label-property"><code>property</code></small>
       <small class="doc doc-label doc-label-cached"><code>cached</code></small>
+      <small class="doc doc-label doc-label-property"><code>property</code></small>
   </span>
 
 </h2>

site/sitemap.xml

@@ -2,17 +2,17 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
          <loc>https://rhettbull.github.io/macnotesapp/</loc>
-         <lastmod>2023-03-14</lastmod>
+         <lastmod>2023-06-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://rhettbull.github.io/macnotesapp/cli/</loc>
-         <lastmod>2023-03-14</lastmod>
+         <lastmod>2023-06-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://rhettbull.github.io/macnotesapp/reference/</loc>
-         <lastmod>2023-03-14</lastmod>
+         <lastmod>2023-06-09</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>