Edit bookmark tags

bookmarks/services/bookmarks.py

@@ -3,10 +3,12 @@ from bs4 import BeautifulSoup
 from django.contrib.auth.models import User
 from django.utils import timezone
 
-from bookmarks.models import Bookmark
+from bookmarks.models import Bookmark, BookmarkForm, parse_tag_string
+from services.tags import get_or_create_tags
 
 
-def create_bookmark(bookmark: Bookmark, current_user: User):
+def create_bookmark(form: BookmarkForm, current_user: User):
+    bookmark = form.save(commit=False)
     # Update website info
     _update_website_metadata(bookmark)
     # Set currently logged in user as owner
@@ -15,11 +17,17 @@ def create_bookmark(bookmark: Bookmark, current_user: User):
     bookmark.date_added = timezone.now()
     bookmark.date_modified = timezone.now()
     bookmark.save()
+    # Update tag list
+    _update_bookmark_tags(bookmark, form.data['tag_string'], current_user)
+    bookmark.save()
 
 
-def update_bookmark(bookmark: Bookmark):
+def update_bookmark(form: BookmarkForm, current_user: User):
+    bookmark = form.save(commit=False)
     # Update website info
     _update_website_metadata(bookmark)
+    # Update tag list
+    _update_bookmark_tags(bookmark, form.data['tag_string'], current_user)
     # Update dates
     bookmark.date_modified = timezone.now()
     bookmark.save()
@@ -42,6 +50,12 @@ def _update_website_metadata(bookmark: Bookmark):
         bookmark.website_description = None
 
 
+def _update_bookmark_tags(bookmark: Bookmark, tag_string: str, user: User):
+    tag_names = parse_tag_string(tag_string, ' ')
+    tags = get_or_create_tags(tag_names, user)
+    bookmark.tags.set(tags)
+
+
 def load_page(url: str):
     r = requests.get(url)
     return r.text

bookmarks/services/importer.py

@@ -3,9 +3,9 @@ from datetime import datetime
 import bs4
 from bs4 import BeautifulSoup
 from django.contrib.auth.models import User
-from django.utils import timezone
 
-from bookmarks.models import Bookmark, Tag
+from bookmarks.models import Bookmark, parse_tag_string
+from services.tags import get_or_create_tags
 
 
 def import_netscape_html(html: str, user: User):
@@ -38,9 +38,9 @@ def _import_bookmark_tag(bookmark_tag: bs4.Tag, user: User):
 
     # Set tags
     tag_string = link_tag['tags']
-    tag_names = tag_string.strip().split(',')
+    tag_names = parse_tag_string(tag_string)
+    tags = get_or_create_tags(tag_names, user)
 
-    tags = [_get_or_create_tag(tag_name, user) for tag_name in tag_names]
     bookmark.tags.set(tags)
     bookmark.save()
 
@@ -50,13 +50,3 @@ def _get_or_create_bookmark(url: str, user: User):
         return Bookmark.objects.get(url=url, owner=user)
     except Bookmark.DoesNotExist:
         return Bookmark()
-
-
-def _get_or_create_tag(name: str, user: User):
-    try:
-        return Tag.objects.get(name=name, owner=user)
-    except Tag.DoesNotExist:
-        tag = Tag(name=name, owner=user)
-        tag.date_added = timezone.now()
-        tag.save()
-        return tag

bookmarks/services/tags.py

@@ -0,0 +1,19 @@
+from typing import List
+
+from django.contrib.auth.models import User
+from django.utils import timezone
+
+from bookmarks.models import Tag
+
+def get_or_create_tags(tag_names: List[str], user: User):
+    return [get_or_create_tag(tag_name, user) for tag_name in tag_names]
+
+
+def get_or_create_tag(name: str, user: User):
+    try:
+        return Tag.objects.get(name=name, owner=user)
+    except Tag.DoesNotExist:
+        tag = Tag(name=name, owner=user)
+        tag.date_added = timezone.now()
+        tag.save()
+        return tag