alpha testing of 0.6.7 version - audio mp3 fix for android

Author: djsudduth

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Added `-lb`option to provide comma delimited labels/tags in the cli for import  
 - Added creation and validation of both the import and import-completed folders on launch
 - Added `-q` option for quiet/silent mode when importing or exporting notes
+- Added `-d` option to remove duplicate tags at the end of notes if already embedded in the note text
+- Fixed audio file extension error for Android mp3 audio types vs Apple m4a audio
 - Cleaned up cli structure
 
 ## 0.6.6 Release (N/A - reverted)

EXAMPLES.md

@@ -18,8 +18,8 @@
 #### Export all active notes in batch without user prompts
 `python kim.py -b --all`
 
-#### Export only notes with the label #science in batch without user prompts
-`python kim.py -b "#science"`
+#### Export only notes with the label #science and remove duplicate trailing hashtags in batch without user prompts
+`python kim.py -d -b "#science"`
 
 #### Export all active notes with silent mode with output to kim.log in batch with create dates after Jan 1, 2023
 `python kim.py -q -cd "> 2023-01-01" -b --all`
@@ -61,6 +61,7 @@ Options:
   -j  Prepend notes with Joplin front matter tags and dates  
   -m  Move any exported Keep notes to Archive  
   -w  Convert pre-formatted markdown note-to-note links to wikilinks  
+  -d  Remove any duplicate labels that are already embedded in a note as hashtags
   -q  Execute exporting or importing in silent mode - output to kim.log
   -i  Import notes from markdown files WARNING - RATE LIMITS!! 
   -lb TEXT  Comma delimited labels for import - for use with only with (-i) flag

README.md

@@ -171,12 +171,18 @@ or
 ```
 will execute KIM without input prompts as long as you have your Google ID in the setting.cfg file and you have stored your Keep access token by running KIM once manually on your device. Be sure the -b flag is the last of all option flags when combining them.
 
-### Silent Mode
+#### Silent Mode
 KIM can suppress any screen prompts or status messages using the -q flag. Silent or quiet mode will pipe all output to at file called `kim.log` in the install diretory. This is useful for batch mode execution. You must have `settings.cfg` setup with your google id so the user prompt will not display.  This works both for exporting and importing:
 ```bash
 > python kim.py -q -b '#mylabel'
 ```
 
+#### Remove Duplicate Labels/Hashtags
+KIM by default appends labels as hashtags at the end of notes. However, Keep can create labels either from the menu or by using hashtags embedded within the note text. KIM can remove any duplicate tags at the end of exported notes using the -d flag. This will allow in-line tags in notes so that apps like Obsidian and Logseq won't have duplicates appended:
+```bash
+> python kim.py -d
+```
+
 #### Archive Notes
 KIM has an option to export only Keep archive notes. All other note types are ignored with this option
 ```bash
@@ -213,9 +219,9 @@ NOTE: the import switches -i and -lb are incompatible with all other switches fo
 
 
 #### Combinations
-Example: to export all non-archived notes, using content for blank note titles, with overwriting, preserving Keep label format, Logseq style paragraphs, with create dates > Oct 3, 2023 in batch:
+Example: to export all non-archived notes, using content for blank note titles, with overwriting, preserving Keep label format, Logseq style paragraphs, removing trailing hashtags if embedded in note, with create dates > Oct 3, 2023 in batch:
 ```bash
-> python kim.py -c -o -p -l -cd "> 2023-10-03" -b --all
+> python kim.py -c -o -p -l -d -cd "> 2023-10-03" -b --all
 ```
 Note: skip -s and overwrite -o cannot be used at the same time
 

kim.py

@@ -1,3 +1,5 @@
+__version__ = "0.6.7"
+
 import os
 import gkeepapi
 import keyring
@@ -17,7 +19,7 @@
 from importlib.metadata import version
 from PIL import Image
 
-KIM_VERSION = "0.6.7"
+
 
 KEEP_KEYRING_ID = 'google-keep-token'
 KEEP_NOTE_URL = "https://keep.google.com/#NOTE/"
@@ -86,6 +88,7 @@ class Options:
     joplin_frontmatter: boolean
     move_to_archive: boolean
     wikilinks: boolean
+    delete_labels: boolean
     silent_mode: boolean
     import_files: boolean
     import_labels: str
@@ -430,8 +433,7 @@ def set_file_extensions(self, data_file, file_name, file_path):
             what = image.format.lower()
             image.close()
         except:
-            what = ".m4a"
-
+            what = ".audio"
 
         if what == 'png':
             media_name = file_name + ".png"
@@ -446,7 +448,12 @@ def set_file_extensions(self, data_file, file_name, file_path):
             media_name = file_name + ".webp"
             blob_final_path = dest_path + ".webp"
         else:
-            extension = ".m4a"
+            with open(data_file, 'rb') as file:
+                val = file.read(8).hex()
+            if val == "0000001c66747970":
+                extension = ".m4a"
+            else:
+                extension = ".mp3"
             media_name = file_name + extension
             blob_final_path = dest_path + extension
 
@@ -493,6 +500,14 @@ def save_md_file(note, note_tags, note_date, opts):
     try:
         fs = FileService()
 
+        # 0.6.6 - if label hashtags are embedded then don't append
+        if opts.delete_labels:
+            for label in note_tags.split():
+                pattern = rf"{re.escape(label)}"
+                if re.search(pattern, note.text):
+                    note_tags = note_tags.replace(label, "")
+
+
         md_text = Markdown().format_check_boxes(note.text)
         note.title = NameService().check_duplicate_name(note.title, note_date)
 
@@ -627,7 +642,8 @@ def keep_query_convert(keep, keepquery, opts):
             )
             if opts.move_to_archive:
                 gnote.archived = True
- 
+
+
         filter_date = opts.create_date or opts.edit_date or None
         coperator = ""
         compare_date = None
@@ -702,9 +718,7 @@ def keep_query_convert(keep, keepquery, opts):
 
             note.title = note.title.replace("/", "")
             note.text = note.text.replace("(" + NOTE_PREFIX,"(" + KEEP_URL)
-            # 0.6.6 for label in note_labels.split():
-            #    note.text = note.text.replace(label, "")
-
+  
             if opts.archive_only:
                 if note.archived and note.trashed == False:
                     keep_get_blobs(keep, note)
@@ -745,7 +759,7 @@ def keep_query_convert(keep, keepquery, opts):
 def ui_login(master_token, opts):
 
     try:
-        intro = "\r\nWelcome to Keep it Markdown or KIM " + KIM_VERSION + "!\r\n"
+        intro = "\r\nWelcome to Keep it Markdown or KIM " + __version__ + "!\r\n"
         if opts.silent_mode:
             now = datetime.datetime.now()
             intro = "\r\n------\r\n" + now.strftime("%Y-%m-%d %H:%M:%S") + intro + "\r\n"
@@ -818,9 +832,9 @@ def ui_query(keep, search_term, opts):
 def _validate_options(opts) -> None:
     VALID_PREFIXES = ("< ", "> ")
     #reduced attribute names for compactness
-    r, o, a, p, s, c, l, j, m, w, q, i, lb, cd, ed  = opts
+    r, o, a, p, s, c, l, j, m, w, d, q, i, lb, cd, ed  = opts
 
-    if i and any([o, a, p, s, c, l, j, m, w]):
+    if i and any([o, a, p, s, c, l, j, m, w, d]):
         raise click.UsageError("Import mode (-i) is not compatible " 
                                 "with export options. Please use only "
                                 "(-i) to import notes.")
@@ -902,6 +916,7 @@ def _validate_paths() -> None:
 @click.option('-j', 'joplin_frontmatter', is_flag=True, help="Prepend notes with Joplin front matter tags and dates")
 @click.option('-m', 'move_to_archive', is_flag=True, help="Move any exported Keep notes to Archive")
 @click.option('-w', 'wikilinks', is_flag=True, help="Convert pre-formatted markdown note-to-note links to wikilinks")
+@click.option('-d', 'delete_labels', is_flag=True, help="Remove any duplicate labels that are already embedded in a note as hashtags")
 @click.option('-q', 'silent_mode', is_flag=True, help="Execute in silent mode - output in kim.log")
 @click.option('-i', 'import_files', is_flag=True, help="Import notes from markdown files WARNING - EXPERIMENTAL!!")
 @click.option('-lb', 'import_labels', '--lb', help="Labels for import - use only with (-i) flag")
@@ -921,6 +936,7 @@ def main(
     joplin_frontmatter: boolean,
     move_to_archive: boolean,
     wikilinks: boolean,
+    delete_labels: boolean,
     silent_mode: boolean,
     import_files: boolean,
     import_labels: str,
@@ -942,6 +958,7 @@ def main(
             joplin_frontmatter,
             move_to_archive,
             wikilinks,
+            delete_labels,
             silent_mode,
             import_files,
             import_labels,