[[package]]
name = "django-storages"
-version = "1.14.4"
+version = "1.14.6"
description = "Support for many storage backends in Django"
optional = false
python-versions = ">=3.7"
files = [
- {file = "django-storages-1.14.4.tar.gz", hash = "sha256:69aca94d26e6714d14ad63f33d13619e697508ee33ede184e462ed766dc2a73f"},
- {file = "django_storages-1.14.4-py3-none-any.whl", hash = "sha256:d61930acb4a25e3aebebc6addaf946a3b1df31c803a6bf1af2f31c9047febaa3"},
+ {file = "django_storages-1.14.6-py3-none-any.whl", hash = "sha256:11b7b6200e1cb5ffcd9962bd3673a39c7d6a6109e8096f0e03d46fab3d3aabd9"},
+ {file = "django_storages-1.14.6.tar.gz", hash = "sha256:7a25ce8f4214f69ac9c7ce87e2603887f7ae99326c316bc8d2d75375e09341c9"},
]
[package.dependencies]
azure = ["azure-core (>=1.13)", "azure-storage-blob (>=12)"]
boto3 = ["boto3 (>=1.4.4)"]
dropbox = ["dropbox (>=7.2.1)"]
-google = ["google-cloud-storage (>=1.27)"]
+google = ["google-cloud-storage (>=1.36.1)"]
libcloud = ["apache-libcloud"]
s3 = ["boto3 (>=1.4.4)"]
sftp = ["paramiko (>=1.15)"]
def file_size(self, instance):
if instance.file:
- if os.path.exists(instance.file.path):
- return filesizeformat(os.stat(instance.file.path).st_size)
- else:
- return '0'
+ try:
+ return filesizeformat(instance.size)
+ except:
+ return 'undefined'
else:
- return '0'
+ return 'none'
def force_resubmit(self, request, queryset):
for script in queryset.all():
--- /dev/null
+# Generated by Django 3.2.25 on 2026-01-09 11:16
+
+from django.db import migrations, models
+import storages.backends.s3
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('exam', '0003_alter_quota_session'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='script',
+ name='size',
+ field=models.IntegerField(blank=True, null=True, verbose_name='size'),
+ ),
+ migrations.AlterField(
+ model_name='script',
+ name='file',
+ field=models.FileField(blank=True, max_length=1024, storage=storages.backends.s3.S3Storage, upload_to='scripts/%Y/%m/%d', verbose_name='PDF file'),
+ ),
+ ]
date_rejected = models.DateTimeField(
_('date rejected'), null=True, blank=True)
url = models.CharField(_('URL'), max_length=2048, blank=True)
+ size = models.IntegerField(_('size'), blank=True, null=True)
@property
def title(self):
if not self.url:
self.url = settings.MEDIA_URL + str(new_rel)
- @property
- def safe_url(self):
- domain = Site.objects.get_current().domain
- url = self.url
- url = url.replace(
- 'http://e-learning.crfpa.pre-barreau.com', '//' + domain)
- return urllib.quote(url)
-
- def unquoted_url(self):
- domain = Site.objects.get_current().domain
- url = self.url
- url = url.replace(
- 'http://e-learning.crfpa.pre-barreau.com', '//' + domain)
- return url
-
def has_annotations_file(self):
"""
check if an annotations file exists. Then use this file, otherwise use the new db implementation
# self.save()
def submit(self):
- self.box_upload_done = 0
-
if not self.file:
self.auto_reject('no file')
return
- if not os.path.exists(self.file.path):
- self.auto_reject('file not found')
- return
-
- mime_type = guess_mimetypes(self.file.path)
+ mime_type = guess_mimetypes(self.file.url)
if mime_type:
if not 'pdf' in mime_type:
self.auto_reject('wrong format')
self.auto_reject('wrong format')
return
- if os.stat(self.file.path).st_size > settings.TELEFORMA_EXAM_SCRIPT_MAX_SIZE:
+ if self.file.size > settings.TELEFORMA_EXAM_SCRIPT_MAX_SIZE:
self.auto_reject('file too large')
return
if not self.status == 0 and self.file:
- # if not self.box_uuid:
- # self.uuid_link()
- # self.box_upload()
if not self.corrector:
self.auto_set_corrector()
if instance.file:
trig_save = False
if not instance.mime_type:
- mime_type = guess_mimetypes(instance.file.path)
- if mime_type:
- instance.mime_type = guess_mimetypes(instance.file.path)
- trig_save = True
- # HOTFIX
- else:
- instance.mime_type = 'application/pdf'
- if not instance.sha1:
- instance.sha1 = sha1sum_file(instance.file.path)
+ instance.mime_type = guess_mimetypes(instance.file.url)
trig_save = True
- if not instance.url:
- instance.uuid_link()
+ if not instance.size:
+ instance.size = instance.file.size
trig_save = True
if not instance.corrector:
instance.submit()
if trig_save:
super(sender, instance).save()
- # if hasattr(instance, 'image'):
- # if not instance.image:
- # path = cache_path + os.sep + instance.uuid + '.jpg'
- # command = 'convert ' + instance.file.path + ' ' + path
- # os.system(command)
- # instance.image = path
-
post_save.connect(set_file_properties, sender=Script,
dispatch_uid="script_post_save")
<br /><br />
<div class="media">
<div class="script">
-{# {% if script.has_annotations_file %}#}
-{# <iframe id="box-iframe" style="position:fixed; top:12%; left:0px; bottom:0px; right:0px; width:100%; height:85%; border:none; margin:0; padding:0; z-index:0;" src="{% if user.quotas.all or user.is_superuser %}{{ script_service_url }}?url={{ script.safe_url }}&username=Examinator&uuid={{ script.uuid }}{% else %}{{ script_service_url }}?url={{ script.safe_url }}&username={{ user.username }}&uuid={{ script.uuid }}{% endif %}">#}
-{# </iframe>#}
-{# {% else %}#}
- {% pdfannotator url=script.unquoted_url uuid=script.uuid %}
-{# {% endif %}#}
+ {% pdfannotator url=script.file.url uuid=script.uuid %}
</div>
</div>
import datetime
import io
import json
+import urllib
import numpy as np
from django.conf import settings
def serve(self, request, pk, streaming=False):
script = self.get_object()
+ print(script)
bucket = False
if settings.TELEFORMA_EXAM_USE_S3:
script = get_object_or_404(Script, id=kwargs['pk'])
# existing PDF
- existing_pdf = PdfReader(script.file.path)
+ remote_file = urllib.request.urlopen(script.file.url).read()
+ memory_file = io.BytesIO(remote_file)
+ existing_pdf = PdfReader(memory_file)
width = existing_pdf.pages[0].mediabox.width
height = existing_pdf.pages[0].mediabox.height
response = HttpResponse(content_type='application/pdf')
response['Content-Disposition'] = 'attachment; filename="%s"' % script.file.name
output.write(response)
+
+ remote_file = None
+ memory_file = None
+
return response
projects / teleforma.git / commitdiff