Refactor packages

bookmarks/forms/__init__.py

@@ -1 +0,0 @@
-from .bookmark_form import *

bookmarks/forms/bookmark_form.py

@@ -1,20 +0,0 @@
-from django import forms
-
-from bookmarks.models import Bookmark
-
-auto_fill_placeholder = 'Leave empty to fill from website metadata'
-
-
-class BookmarkForm(forms.ModelForm):
-    # Use URLField for URL
-    url = forms.URLField()
-    # Do not require title and description in form as we fill these automatically if they are empty
-    title = forms.CharField(max_length=512,
-                            required=False,
-                            widget=forms.TextInput(attrs={'placeholder': auto_fill_placeholder}))
-    description = forms.CharField(required=False,
-                                  widget=forms.Textarea(attrs={'placeholder': auto_fill_placeholder}))
-
-    class Meta:
-        model = Bookmark
-        fields = ['url', 'title', 'description']

bookmarks/models.py

@@ -1,8 +1,8 @@
+from django import forms
 from django.contrib.auth import get_user_model
 from django.db import models
 
 
-# Create your models here.
 class Bookmark(models.Model):
     url = models.URLField()
     title = models.CharField(max_length=512)
@@ -25,3 +25,21 @@ class Bookmark(models.Model):
 
     def __str__(self):
         return self.resolved_title + ' (' + self.url[:30] + '...)'
+
+
+auto_fill_placeholder = 'Leave empty to fill from website metadata'
+
+
+class BookmarkForm(forms.ModelForm):
+    # Use URLField for URL
+    url = forms.URLField()
+    # Do not require title and description in form as we fill these automatically if they are empty
+    title = forms.CharField(max_length=512,
+                            required=False,
+                            widget=forms.TextInput(attrs={'placeholder': auto_fill_placeholder}))
+    description = forms.CharField(required=False,
+                                  widget=forms.Textarea(attrs={'placeholder': auto_fill_placeholder}))
+
+    class Meta:
+        model = Bookmark
+        fields = ['url', 'title', 'description']

bookmarks/templatetags/bookmarks.py

@@ -1,6 +1,6 @@
 from django import template
 
-from bookmarks.forms import BookmarkForm
+from bookmarks.models import BookmarkForm
 
 register = template.Library()
 

bookmarks/urls.py

@@ -8,9 +8,9 @@ app_name = 'bookmarks'
 urlpatterns = [
     # Redirect root to bookmarks index
     url(r'^$', RedirectView.as_view(pattern_name='bookmarks:index', permanent=False)),
+    # Bookmarks
     path('bookmarks', views.index, name='index'),
     path('bookmarks/new', views.new, name='new'),
     path('bookmarks/<int:bookmark_id>/edit', views.edit, name='edit'),
-    # path('bookmarks/<int:bookmark_id>/update', views.update, name='edit'),
     path('bookmarks/<int:bookmark_id>/remove', views.remove, name='remove'),
 ]

bookmarks/views/__init__.py

@@ -0,0 +1 @@
+from .bookmarks import *

bookmarks/views/bookmarks.py

@@ -2,9 +2,8 @@ from django.http import HttpResponseRedirect, HttpRequest
 from django.shortcuts import render
 from django.urls import reverse
 
+from bookmarks.models import Bookmark, BookmarkForm
 from bookmarks.services.bookmarks import create_bookmark, update_bookmark
-from . import forms
-from .models import Bookmark
 
 
 def index(request):
@@ -16,14 +15,14 @@ def index(request):
 
 def new(request: HttpRequest):
     if request.method == 'POST':
-        form = forms.BookmarkForm(request.POST)
+        form = BookmarkForm(request.POST)
         if form.is_valid():
             bookmark = form.save(commit=False)
             current_user = request.user
             create_bookmark(bookmark, current_user)
             return HttpResponseRedirect(reverse('bookmarks:index'))
     else:
-        form = forms.BookmarkForm()
+        form = BookmarkForm()
 
     return render(request, 'bookmarks/new.html', {'form': form})
 
@@ -31,13 +30,13 @@ def new(request: HttpRequest):
 def edit(request, bookmark_id):
     bookmark = Bookmark.objects.get(pk=bookmark_id)
     if request.method == 'POST':
-        form = forms.BookmarkForm(request.POST, instance=bookmark)
+        form = BookmarkForm(request.POST, instance=bookmark)
         if form.is_valid():
             bookmark = form.save(commit=False)
             update_bookmark(bookmark)
             return HttpResponseRedirect(reverse('bookmarks:index'))
     else:
-        form = forms.BookmarkForm(instance=bookmark)
+        form = BookmarkForm(instance=bookmark)
 
     return render(request, 'bookmarks/edit.html', {'form': form, 'bookmark_id': bookmark_id})