rucki/my2dos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update collections and attachment uploads

Browse Source
This commit is contained in:
rucki
2026-09-03 13:59:02 +02:00
parent 28e17a4b21
commit d97244de40
9 changed files with 337 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/views.py
+76 -14
View File
@@ -26,6 +26,7 @@ TYPE_COMMAND_RE = re.compile(r'^/(todo|note|link|journal)\b', re.I)
VISIBILITY_COMMAND_RE = re.compile(r'/(public|private)\b', re.I)
URL_RE = re.compile(r'https?://\S+')
ONLY_URL_RE = re.compile(r'^https?://\S+$')
FIRST_LINE_URL_RE = re.compile(r'^(https?://\S+)[ \t]*(?:\r?\n|$)')
TITLE_RE = re.compile(r'<title[^>]*>(.*?)</title>', re.I | re.S)
DATE_COMMAND_RE = re.compile(r'/datum\s+(\d{1,2}\.\d{1,2}\.(?:\d{2}|\d{4}))(?:\s+(\d{1,2}:\d{2}))?\b', re.I)
RELATIVE_DATE_COMMAND_RE = re.compile(r'/(morgen|übermorgen|uebermorgen|nächstewoche|naechstewoche)\b', re.I)
@@ -88,20 +89,25 @@ def parse_quick_content(raw, default_kind=Item.Kind.NOTE):
visibility_spans = [(match.start() - offset, match.end() - offset) for match in visibility_matches if match.start() >= offset]
content = remove_spans(content, visibility_spans)
only_url = bool(ONLY_URL_RE.match(content))
first_line_url_match = FIRST_LINE_URL_RE.match(content)
if type_command == 'todo':
kind = Item.Kind.TODO
elif type_command == 'journal':
kind = Item.Kind.JOURNAL
elif type_command == 'link' or only_url:
elif type_command == 'link' or only_url or first_line_url_match:
kind = Item.Kind.LINK
elif type_command == 'note':
kind = Item.Kind.NOTE
else:
kind = default_kind if default_kind in Item.Kind.values else Item.Kind.NOTE
visibility = Item.Visibility.PUBLIC if 'public' in visibility_commands else Item.Visibility.PRIVATE
url_match = URL_RE.search(content)
url = url_match.group(0) if kind == Item.Kind.LINK and url_match else ''
if only_url:
url_match = first_line_url_match or URL_RE.search(content)
url = url_match.group(1) if kind == Item.Kind.LINK and first_line_url_match else (url_match.group(0) if kind == Item.Kind.LINK and url_match else '')
if first_line_url_match:
title = fetch_page_title(url) or url
extra_content = content[first_line_url_match.end():].strip()
content = f'{title}\n{extra_content}' if extra_content else title
elif only_url:
content = fetch_page_title(url) or url
return kind, visibility, content, url
@@ -153,9 +159,13 @@ def parse_due_at_from_post(post):
def attach_files_and_replace_tokens(item, files):
replacements = {}
attached = False
for file in files:
attachment = Attachment.objects.create(item=item, file=file)
attached = True
replacements[f'![[paste:{file.name}]]'] = f'![[file:{attachment.id}]]'
if attached and hasattr(item, '_prefetched_objects_cache'):
item._prefetched_objects_cache.pop('attachments', None)
if replacements:
content = item.content
comment = item.comment
@@ -350,6 +360,13 @@ def new_item(request):
next_url = request.GET.get('next') or request.POST.get('next') or reverse('index')
if next_url == 'index':
next_url = reverse('index')
collection = None
collection_id = request.GET.get('collection') or request.POST.get('collection')
if collection_id:
collection = get_object_or_404(visible_collections(request.user).filter(mode__in=Collection.STRUCTURED_MODES), pk=collection_id)
if not user_can_edit_collection(request.user, collection):
return JsonResponse({'error': 'forbidden'}, status=403)
requested_kind = Item.Kind.NOTE
if request.method == 'POST':
form = QuickItemForm(request.POST, request.FILES)
if form.is_valid():
@@ -362,9 +379,12 @@ def new_item(request):
attach_files_and_replace_tokens(item, request.FILES.getlist('files'))
item.sync_metadata()
apply_team_from_tags(item, request.user, force_private=bool(re.search(r'/private\b', raw, re.I)))
if collection:
item = adapt_item_for_collection(item, collection)
add_collection_section(collection, item)
return redirect(next_url)
return render(request, 'core/new_item.html', {
'form': QuickItemForm(), 'tags': Tag.objects.all(), 'requested_kind': requested_kind, 'next_url': next_url,
'form': QuickItemForm(), 'tags': Tag.objects.all(), 'requested_kind': requested_kind, 'next_url': next_url, 'collection': collection,
})
@@ -715,6 +735,10 @@ def editable_collection_notes(user):
).filter(Q(owner=user) | Q(team_id__in=user_team_ids(user))).distinct()
def collection_is_structured_mode(mode):
return mode in Collection.STRUCTURED_MODES
def collection_detail_context(request, collection, pending_item=None):
can_edit = user_can_edit_collection(request.user, collection)
q = request.GET.get('q', '').strip()
@@ -724,7 +748,7 @@ def collection_detail_context(request, collection, pending_item=None):
used_item_ids = set(collection.sections.filter(item__isnull=False).values_list('item_id', flat=True))
used_collection_ids = set(collection.sections.filter(sub_collection__isnull=False).values_list('sub_collection_id', flat=True))
candidates = editable_collection_notes(request.user).annotate(collection_use_count=Count('collection_sections', distinct=True))
collection_candidates = visible_collections(request.user).filter(mode=Collection.Mode.MANUAL).exclude(pk=collection.pk).annotate(collection_use_count=Count('containing_sections', distinct=True))
collection_candidates = visible_collections(request.user).filter(mode__in=Collection.STRUCTURED_MODES).exclude(pk=collection.pk).annotate(collection_use_count=Count('containing_sections', distinct=True))
collection_candidates = [candidate for candidate in collection_candidates if collection_subcollection_is_compatible(collection, candidate) and not collection_contains_collection(candidate, collection)]
if q:
candidates = candidates.filter(Q(content__icontains=q) | Q(tags__name__icontains=q)).distinct()
@@ -750,11 +774,25 @@ def collection_detail_context(request, collection, pending_item=None):
@login_required
def collection_list(request):
active_mode = request.GET.get('mode', 'listed')
collections = visible_collections(request.user).prefetch_related('filter_tags')
if active_mode == 'manual':
collections = collections.filter(mode=Collection.Mode.MANUAL)
elif active_mode == 'tutorial':
collections = collections.filter(mode=Collection.Mode.TUTORIAL)
elif active_mode == 'tags':
collections = collections.filter(mode=Collection.Mode.TAGS)
elif active_mode == 'chapter':
collections = collections.filter(mode=Collection.Mode.CHAPTER)
else:
active_mode = 'listed'
collections = collections.exclude(mode=Collection.Mode.CHAPTER)
entries = []
for collection in visible_collections(request.user).prefetch_related('filter_tags'):
for collection in collections:
count = collection_tag_items(collection).count() if collection.mode == Collection.Mode.TAGS else collection.sections.count()
entries.append({'collection': collection, 'section_count': count})
return render(request, 'core/collection_list.html', {'entries': entries})
orphan_chapters = visible_collections(request.user).filter(mode=Collection.Mode.CHAPTER, containing_sections__isnull=True) if active_mode != 'chapter' else Collection.objects.none()
return render(request, 'core/collection_list.html', {'entries': entries, 'active_mode': active_mode, 'orphan_chapters': orphan_chapters})
@login_required
@@ -772,7 +810,7 @@ def collection_create(request):
collection.team = team
collection.save()
form.save_m2m()
if collection.mode == Collection.Mode.MANUAL:
if collection.mode != Collection.Mode.TAGS:
collection.filter_tags.clear()
messages.success(request, _('Collection created.'))
return redirect(collection)
@@ -791,8 +829,8 @@ def collection_edit(request, pk):
if form.is_valid():
visibility, team = collection_target_from_form(form, request.user)
target_mode = form.cleaned_data['mode']
has_manual_sections = collection.mode == Collection.Mode.MANUAL and collection.sections.exists()
incompatible = target_mode == Collection.Mode.MANUAL and any(
has_manual_sections = collection_is_structured_mode(collection.mode) and collection.sections.exists()
incompatible = collection_is_structured_mode(target_mode) and any(
not collection_scope_allows_item(
visibility, team.id if team else None, collection.owner_id,
section.item.visibility, section.item.team_id, section.item.owner_id,
@@ -814,7 +852,7 @@ def collection_edit(request, pk):
collection.team = team
collection.save()
form.save_m2m()
if collection.mode == Collection.Mode.MANUAL:
if collection.mode != Collection.Mode.TAGS:
collection.filter_tags.clear()
messages.success(request, _('Collection saved.'))
return redirect(collection)
@@ -827,7 +865,7 @@ def collection_detail(request, pk):
collection = get_object_or_404(visible_collections(request.user), pk=pk)
return render(request, 'core/collection_detail.html', {
'collection': collection,
'sections': collection.sections.select_related('item', 'sub_collection').prefetch_related('item__tags', 'item__attachments', 'sub_collection__sections__item', 'sub_collection__sections__sub_collection') if collection.mode == Collection.Mode.MANUAL else [],
'sections': collection.sections.select_related('item', 'sub_collection').prefetch_related('item__tags', 'item__attachments', 'sub_collection__sections__item', 'sub_collection__sections__sub_collection') if collection.is_structured else [],
'tag_items': collection_tag_items(collection) if collection.mode == Collection.Mode.TAGS else [],
'can_edit': user_can_edit_collection(request.user, collection),
})
@@ -864,8 +902,19 @@ def collection_manage(request, pk):
return redirect(redirect_url)
add_collection_section(collection, item)
return redirect(redirect_url)
if action == 'create_chapter':
title = request.POST.get('title', '').strip()[:200]
if title:
chapter = Collection.objects.create(
owner=request.user, title=title, mode=Collection.Mode.CHAPTER,
visibility=collection.visibility, team=collection.team,
)
add_collection_subcollection(collection, chapter)
return redirect(reverse('collection_manage', args=[chapter.pk]))
messages.error(request, _('Enter a chapter title.'))
return redirect(redirect_url)
if action == 'add_collection':
sub_collection = get_object_or_404(visible_collections(request.user), pk=request.POST.get('collection_id'), mode=Collection.Mode.MANUAL)
sub_collection = get_object_or_404(visible_collections(request.user).filter(mode__in=Collection.STRUCTURED_MODES), pk=request.POST.get('collection_id'))
if sub_collection.pk == collection.pk or collection_contains_collection(sub_collection, collection):
messages.error(request, _('This would create a collection loop.'))
elif not collection_subcollection_is_compatible(collection, sub_collection):
@@ -891,6 +940,19 @@ def collection_manage(request, pk):
CollectionSection.objects.filter(pk=section.pk).update(position=temporary)
CollectionSection.objects.filter(pk=other.pk).update(position=section.position)
CollectionSection.objects.filter(pk=section.pk).update(position=other.position)
elif action == 'move_to':
try:
new_position = int(request.POST.get('position', section.position))
except (TypeError, ValueError):
new_position = section.position
ordered = list(collection.sections.order_by('position', 'id'))
ordered.remove(section)
ordered.insert(max(0, min(new_position, len(ordered))), section)
with transaction.atomic():
for index, current in enumerate(ordered):
CollectionSection.objects.filter(pk=current.pk).update(position=1000 + index)
for index, current in enumerate(ordered):
CollectionSection.objects.filter(pk=current.pk).update(position=index)
return redirect(redirect_url)
return render(request, 'core/collection_manage.html', collection_detail_context(request, collection))