diff --git a/data/db.sqlite3 b/data/db.sqlite3 index 39093c1..852b63b 100644 Binary files a/data/db.sqlite3 and b/data/db.sqlite3 differ diff --git a/docker.sh b/docker.sh index 8bb65b9..5737507 100755 --- a/docker.sh +++ b/docker.sh @@ -7,6 +7,7 @@ case "$1" in docker-compose up -d echo "Services started. Access:" echo "- Web: http://localhost:8000" + docker-compose logs -f ;; "stop") docker-compose down diff --git a/links/migrations/0035_add_webpage_content_to_page.py b/links/migrations/0035_add_webpage_content_to_page.py deleted file mode 100644 index d92b7a7..0000000 --- a/links/migrations/0035_add_webpage_content_to_page.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.1.13 on 2025-11-04 11:02 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('links', '0034_post_summary'), - ] - - operations = [ - migrations.AddField( - model_name='page', - name='webpage_content', - field=models.TextField(blank=True, help_text='Markdown content extracted from Crawl4AI', verbose_name='Webpage Content (Markdown)'), - ), - ] diff --git a/links/models.py b/links/models.py index 872f2cf..996a6d6 100644 --- a/links/models.py +++ b/links/models.py @@ -176,7 +176,6 @@ class Page(models.Model): title = models.CharField(_('Title'), max_length=200, blank=True) summary = models.TextField(_('Summary'), blank=True) content = models.TextField(_('Content'), blank=True) - webpage_content = models.TextField(_('Webpage Content (Markdown)'), blank=True, help_text=_('Markdown content extracted from Crawl4AI')) created_at = models.DateTimeField(_('Created at'), default=timezone.now) updated_at = models.DateTimeField(_('Updated at'), auto_now=True) tags = models.ManyToManyField('Tag', blank=True, related_name='pages') diff --git a/links/search_views.py b/links/search_views.py index ad09e6a..6f190c7 100644 --- a/links/search_views.py +++ b/links/search_views.py @@ -54,8 +54,7 @@ class SearchView(ListView): Q(url__icontains=query) | Q(title__icontains=query) | Q(summary__icontains=query) | - Q(content__icontains=query) | - Q(webpage_content__icontains=query) + Q(content__icontains=query) ).values('id', 'url', 'title', 'summary', 'created_at').annotate( model_type=Value('page', output_field=CharField()) ) diff --git a/links/serializers.py b/links/serializers.py index 1438b39..59c45e1 100644 --- a/links/serializers.py +++ b/links/serializers.py @@ -4,9 +4,9 @@ from .models import Page, Post, ImageCollection, Image, Tag class PageSerializer(serializers.ModelSerializer): class Meta: model = Page - fields = ['id', 'url', 'title', 'summary', 'content', 'webpage_content', 'screenshot_path', + fields = ['id', 'url', 'title', 'summary', 'content', 'screenshot_path', 'process_status', 'created_at', 'updated_at'] - read_only_fields = ['id', 'screenshot_path', 'process_status', 'webpage_content', + read_only_fields = ['id', 'screenshot_path', 'process_status', 'created_at', 'updated_at'] class PostSerializer(serializers.ModelSerializer): diff --git a/links/tasks.py b/links/tasks.py index 771637f..f02a726 100644 --- a/links/tasks.py +++ b/links/tasks.py @@ -310,7 +310,7 @@ def fetch_webpage_content_from_crawl4ai(page_id, retry_count=0): markdown_content = data.get('markdown', '') if markdown_content: - page.webpage_content = markdown_content + page.content = markdown_content page.save() logger.info(f"Successfully fetched webpage content for page {page_id}") else: diff --git a/links/templates/links/page_detail.html b/links/templates/links/page_detail.html index c86eb94..dc3377b 100644 --- a/links/templates/links/page_detail.html +++ b/links/templates/links/page_detail.html @@ -283,43 +283,7 @@ {% endwith %} - - {% if page.webpage_content %} -
-
-
-

{% trans "Full Webpage Content" %}

- -
-
-
- {{ page.webpage_content|markdown|safe }} -
-
-
-

{% trans "Click 'Expand' to view the full webpage content extracted by Crawl4AI" %}

-
-
-
- {% endif %} +