sdbs/pile
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

public files visible, but not downloadable

Browse source
This commit is contained in:
Tomáš Mládek 2020-04-23 22:47:24 +02:00
parent 23faa2bb69
commit a3efcca29a
4 changed files with 43 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sdbs_pile/pile/models.py
View file

@ -11,18 +11,11 @@ class Tag(SoftDeletableModel):
name = models.CharField(max_length=128, null=False, blank=False)
description = models.TextField(null=False, blank=True)
@property
def documents_exclude_hidden(self):
return Document.objects.exclude_hidden().filter(tags__in=[self])
def __str__(self):
return self.name
class DocumentQuerySet(QuerySet):
def exclude_hidden(self):
return super().filter(public=True)
def untagged(self):
return super().annotate(tag_count=Count('tags')).filter(tag_count=0)

35
sdbs_pile/pile/templates/front_doc_detail.html
View file

@ -36,22 +36,29 @@
</div>
{% endif %}
{% if document.is_local_pdf %}
<div class="doc-link">
<span class="doc-link-intro">Access file as:</span>
<a href="{% url "pile:retrieve" document.id %}">Entry #{{ document.id }} of /-\ pile</a>
</div>
{% if document.public or can_see_hidden %}
{% if document.is_local_pdf %}
<div class="doc-link">
<span class="doc-link-intro">Access file as:</span>
<a href="{% url "pile:retrieve" document.id %}">Entry #{{ document.id }} of /-\ pile</a>
</div>
<div class="doc-link">
<span class="doc-link-intro">Get original document at: </span>
<a href="{{ document.url }}">{{ document.url }}</a>
</div>
<div class="doc-link">
<span class="doc-link-intro">Get original document at: </span>
<a href="{{ document.url }}">{{ document.url }}</a>
</div>
{% else %}
<div class="doc-link">
<span class="doc-link-intro">Access file at:</span>
<a href="{{ document.url }}">{{ document.url }}</a>
</div>
<div class="doc-link">
<span class="doc-link-intro">Get label for file at:</span>
<a href="{% url "pile:label" document.id %}">{% url "pile:label" document.id %}</a>
</div>
{% endif %}
{% else %}
<div class="doc-link">
<span class="doc-link-intro">Access file at:</span>
<a href="{{ document.url }}">{{ document.url }}</a>
</div>
<div class="doc-link">
<span class="doc-link-intro">Get label for file at:</span>
<a href="{% url "pile:label" document.id %}">{% url "pile:label" document.id %}</a>

4
sdbs_pile/pile/templates/front_doc_listing.html
View file

@ -24,7 +24,9 @@
<div class="text docs-header"><h3>{{ status.label }}</h3></div>
{% for document in documents %}
<div class="text doc-item">
<a class="doc-item-link" href="{% url "pile:retrieve" document.id %}">🔗</a>
{% if document.public or can_see_hidden %}
<a class="doc-item-link" href="{% url "pile:retrieve" document.id %}">🔗</a>
{% endif %}
<a href="{% url "pile:document" document.id %}">
<div class="doc-item-text">
<h2>{{ document.title }}</h2>

44
sdbs_pile/pile/views.py
View file

@ -8,7 +8,7 @@ from random import choice
import weasyprint
from PyPDF2 import PdfFileWriter, PdfFileReader
from django.contrib.syndication.views import Feed
from django.core.exceptions import ObjectDoesNotExist
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied
from django.http import Http404, FileResponse, HttpRequest
from django.shortcuts import redirect
from django.template.loader import render_to_string
@ -19,27 +19,18 @@ from django.views.generic import TemplateView
from sdbs_pile.pile.models import Tag, Document
class BasePileViewMixin(View):
@property
def include_hidden(self):
return self.request.user.has_perm('pile.see_hidden')
@property
def documents(self):
return Document.objects if self.include_hidden else Document.objects.exclude_hidden()
class BasePileView(BasePileViewMixin, TemplateView):
class BasePileView(TemplateView):
def get_context_data(self, **kwargs):
tags = list(Tag.objects.all())
tags.sort(key=lambda tag: tag.name)
tags = [(tag, (tag.documents if self.include_hidden else tag.documents_exclude_hidden).count()) for tag in tags]
tags = [(tag, tag.documents.count()) for tag in tags]
tags.sort(key=itemgetter(1), reverse=True)
return {
'tags': tags,
'document_count': self.documents.count(),
'untagged_count': self.documents.untagged().count()
'document_count': Document.objects.count(),
'untagged_count': Document.objects.untagged().count(),
'can_see_hidden': self.request.user.has_perm('pile.see_hidden')
}
@ -50,8 +41,8 @@ class IndexView(BasePileView):
base_context_data = super(IndexView, self).get_context_data(**kwargs)
return {
'recent_documents': self.documents.order_by('-uploaded')[:5],
'random_document': choice(self.documents.all()[5:]) if self.documents.count() > 0 else None,
'recent_documents': Document.objects.order_by('-uploaded')[:5],
'random_document': choice(Document.objects.all()[5:]) if Document.objects.count() > 0 else None,
**base_context_data
}
@ -64,17 +55,17 @@ class TagView(BasePileView):
if name_or_id == "*":
tag = None
documents = self.documents.all()
documents = Document.objects.all()
elif name_or_id == "_":
tag = "UNTAGGED"
documents = self.documents.untagged()
documents = Document.objects.untagged()
else:
try:
try:
tag = Tag.objects.get(id=int(name_or_id))
except ValueError:
tag = Tag.objects.get(name=name_or_id)
documents = tag.documents.all() if self.include_hidden else tag.documents_exclude_hidden
documents = tag.documents.all()
except ObjectDoesNotExist:
raise Http404
@ -97,7 +88,7 @@ class DocumentView(BasePileView):
base_context_data = super(DocumentView, self).get_context_data()
try:
document = self.documents.get(pk=document_id)
document = Document.objects.get(pk=document_id)
except ObjectDoesNotExist:
raise Http404
@ -107,10 +98,10 @@ class DocumentView(BasePileView):
}
class LabelView(BasePileViewMixin):
class LabelView(View):
def get(self, request: HttpRequest, document_id: int):
try:
document = self.documents.get(pk=document_id)
document = Document.objects.get(pk=document_id)
except ObjectDoesNotExist:
raise Http404
@ -129,13 +120,16 @@ class LabelView(BasePileViewMixin):
return stream
class DocumentWithLabelView(BasePileViewMixin):
class DocumentWithLabelView(View):
def get(self, request: HttpRequest, document_id: int):
try:
document = self.documents.get(pk=document_id)
document = Document.objects.get(pk=document_id)
except ObjectDoesNotExist:
raise Http404
if not self.request.user.has_perm('pile.see_hidden') and not document.public:
raise PermissionDenied()
if document.is_local_pdf:
try:
label_stream = LabelView.get_label(request, document)