From 2174e9a90fc93520387864730b9b193211049a3d Mon Sep 17 00:00:00 2001 From: Patrick Date: Fri, 2 Oct 2020 22:42:42 +0000 Subject: [PATCH] make master pep8-ready again --- fet2020/blackboard/admin.py | 4 +- fet2020/blackboard/models.py | 83 +++++++++++++++--------------------- fet2020/blackboard/tests.py | 2 +- fet2020/blackboard/urls.py | 4 -- fet2020/blackboard/views.py | 8 ++-- 5 files changed, 42 insertions(+), 59 deletions(-) diff --git a/fet2020/blackboard/admin.py b/fet2020/blackboard/admin.py index e4000b8b..3258c7a2 100644 --- a/fet2020/blackboard/admin.py +++ b/fet2020/blackboard/admin.py @@ -1,11 +1,10 @@ from django.contrib import admin + from .models import JobPosting -# Register your models here. class JobPostingAdmin(admin.ModelAdmin): model = JobPosting - fieldsets = ( (None, { 'fields': ( @@ -18,4 +17,5 @@ class JobPostingAdmin(admin.ModelAdmin): }), ) + admin.site.register(JobPosting, JobPostingAdmin) diff --git a/fet2020/blackboard/models.py b/fet2020/blackboard/models.py index 3d871f49..7f72777b 100644 --- a/fet2020/blackboard/models.py +++ b/fet2020/blackboard/models.py @@ -1,28 +1,17 @@ -from django.db import models -from easy_thumbnails.fields import ThumbnailerImageField -from django.core.validators import ValidationError -from django.utils import timezone -import ghostscript -import locale -from django.utils.translation import gettext_lazy as _ from django.conf import settings -from os.path import splitext, basename -import os +from django.core.validators import ValidationError +from django.db import models +from django.utils import timezone +from django.utils.translation import gettext_lazy as _ +import locale +import os +from os.path import splitext, basename + +import ghostscript import logging -logger = logging.getLogger('posts') -request_logger = logging.getLogger('django.request') - -# Create your models here - - -## Datenbank: -#Firmenname ÖBB -#Job name Junior Chef -#pdf location ./blackboard/pdf/20201002_oebb_jun.pdf -#pdf thumbnail location ./blackboard/thumb/20201002_oebb_jun_thumb.jpg -#publish date 20201002 +logger = logging.getLogger('blackboard') class JobPosting(models.Model): @@ -33,7 +22,6 @@ class JobPosting(models.Model): pdf_thumb_location = models.CharField(max_length=128) publishDate = models.DateField('date published', default=timezone.now) - # Managers all_jobPosting = models.Manager() @@ -44,16 +32,16 @@ class JobPosting(models.Model): def __str__(self): return str(self.publishDate) + "_" + self.companyName + "_" + self.jobName - def pdf2jpeg(self, pdf_input_path, jpeg_output_path): - args = ["pef2jpeg", # actual value doesn't matter - "-dNOPAUSE", - "-sDEVICE=jpeg", - "-dDEVICEWIDTHPOINTS=600", - "-dDEVICEHEIGHTPOINTS=800", - #"-r144", - "-sOutputFile=" + jpeg_output_path, - pdf_input_path] + args = [ + "pef2jpeg", # actual value doesn't matter + "-dNOPAUSE", + "-sDEVICE=jpeg", + "-dDEVICEWIDTHPOINTS=600", + "-dDEVICEHEIGHTPOINTS=800", + "-sOutputFile=" + jpeg_output_path, + pdf_input_path + ] encoding = locale.getpreferredencoding() args = [a.encode(encoding) for a in args] @@ -62,28 +50,27 @@ class JobPosting(models.Model): def save(self, *args, **kwargs): super().save(*args, **kwargs) - if not os.path.exists(settings.MEDIA_ROOT + "uploads/blackboard/thumb/"): os.makedirs(settings.MEDIA_ROOT + "uploads/blackboard/thumb/") - - pdf_thumb_location_full = settings.MEDIA_ROOT + "uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" - self.pdf_thumb_location = "/files/uploads/blackboard/thumb/" + splitext(basename(self.pdfLocation.name))[0] + ".jpg" - self.pdf2jpeg(self.pdfLocation.path, pdf_thumb_location_full) - request_logger.info("SavenThumbAs: " + self.pdf_thumb_location) - super().save(*args, **kwargs) + pdf_thumb_location_full = settings.MEDIA_ROOT \ + + "uploads/blackboard/thumb/" \ + + splitext(basename(self.pdfLocation.name))[0] \ + + ".jpg" + + self.pdf_thumb_location = "/files/uploads/blackboard/thumb/" \ + + splitext(basename(self.pdfLocation.name))[0] \ + + ".jpg" + + self.pdf2jpeg(self.pdfLocation.path, pdf_thumb_location_full) + logger.info("SavenThumbAs: " + self.pdf_thumb_location) + super().save(*args, **kwargs) def clean(self): count = 0 - for i in self.pdfLocation.name: - if i == '.': + for i in self.pdfLocation.name: + if i == '.': count = count + 1 - if count > 1:#if more than one dot in filename - raise ValidationError( - _('Keine Dateien mit >1 Punkten im Namen erlaubt.') - ) - - - - + if count > 1: # if more than one dot in filename + raise ValidationError(_('Keine Dateien mit >1 Punkten im Namen erlaubt.')) diff --git a/fet2020/blackboard/tests.py b/fet2020/blackboard/tests.py index 7ce503c2..a79ca8be 100644 --- a/fet2020/blackboard/tests.py +++ b/fet2020/blackboard/tests.py @@ -1,3 +1,3 @@ -from django.test import TestCase +# from django.test import TestCase # Create your tests here. diff --git a/fet2020/blackboard/urls.py b/fet2020/blackboard/urls.py index d873cf48..89addfe8 100644 --- a/fet2020/blackboard/urls.py +++ b/fet2020/blackboard/urls.py @@ -5,8 +5,4 @@ from . import views urlpatterns = [ path('', views.index, name='blackboard'), - - #path('', views.members_view), - #path('jobs/', views.jobs_view), - #path('member/', views.profile_view, name="member"), ] diff --git a/fet2020/blackboard/views.py b/fet2020/blackboard/views.py index c13f90e8..c51eff0e 100644 --- a/fet2020/blackboard/views.py +++ b/fet2020/blackboard/views.py @@ -1,13 +1,13 @@ from django.shortcuts import render -from .models import JobPosting from django.utils import timezone -import datetime +from datetime import timedelta + +from .models import JobPosting -# Create your views here. def index(request): - jobPost_cutoff = datetime.date.today() - datetime.timedelta(30)#30days from now + jobPost_cutoff = timezone.now().date() - timedelta(30) # 30days from now context = { "jobPostings": JobPosting.all_jobPosting.filter(publishDate__gt=jobPost_cutoff), }