Add thumbnail support

This commit is contained in:
rubenwardy 2018-05-29 16:19:17 +01:00
parent 048b604a75
commit 6a13dca2d5
No known key found for this signature in database
GPG Key ID: A1E29D52FF81513C
6 changed files with 60 additions and 8 deletions

1
.gitignore vendored

@ -6,6 +6,7 @@ tmp
log.txt log.txt
*.rdb *.rdb
uploads uploads
thumbnails
# Created by https://www.gitignore.io/api/linux,macos,python,windows # Created by https://www.gitignore.io/api/linux,macos,python,windows

@ -374,9 +374,18 @@ class Package(db.Model):
"repo": self.repo, "repo": self.repo,
"url": base_url + self.getDownloadURL(), "url": base_url + self.getDownloadURL(),
"release": self.getDownloadRelease().id if self.getDownloadRelease() is not None else None, "release": self.getDownloadRelease().id if self.getDownloadRelease() is not None else None,
"screenshots": [base_url + ss.url for ss in self.screenshots] "screenshots": [base_url + ss.url for ss in self.screenshots],
"thumbnail": base_url + self.getThumbnailURL()
} }
def getThumbnailURL(self):
screenshot = self.screenshots.filter_by(approved=True).first()
return screenshot.getThumbnailURL() if screenshot is not None else None
def getMainScreenshotURL(self):
screenshot = self.screenshots.filter_by(approved=True).first()
return screenshot.url if screenshot is not None else None
def getDetailsURL(self): def getDetailsURL(self):
return url_for("package_page", return url_for("package_page",
author=self.author.username, name=self.name) author=self.author.username, name=self.name)
@ -409,10 +418,6 @@ class Package(db.Model):
return url_for("package_download_page", return url_for("package_download_page",
author=self.author.username, name=self.name) author=self.author.username, name=self.name)
def getMainScreenshotURL(self):
screenshot = self.screenshots.filter_by(approved=True).first()
return screenshot.url if screenshot is not None else None
def getDownloadRelease(self): def getDownloadRelease(self):
for rel in self.releases: for rel in self.releases:
if rel.approved: if rel.approved:
@ -575,7 +580,7 @@ class PackageScreenshot(db.Model):
id=self.id) id=self.id)
def getThumbnailURL(self): def getThumbnailURL(self):
return self.url # TODO return self.url.replace("/uploads/", "/thumbnails/332x221/")
class EditRequest(db.Model): class EditRequest(db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)

@ -1,6 +1,6 @@
{% macro render_pkgtile(package) -%} {% macro render_pkgtile(package) -%}
<li><a href="{{ package.getDetailsURL() }}" <li><a href="{{ package.getDetailsURL() }}"
style="background-image: url({{ package.getMainScreenshotURL() or '/static/placeholder.png' }});"> style="background-image: url({{ package.getThumbnailURL() or '/static/placeholder.png' }});">
<div class="packagegridscrub"></div> <div class="packagegridscrub"></div>
<div class="packagegridinfo"> <div class="packagegridinfo">
<h3>{{ package.title }} by {{ package.author.display_name }}</h3> <h3>{{ package.title }} by {{ package.author.display_name }}</h3>

@ -51,7 +51,7 @@ def home_page():
packages = query.order_by(db.desc(Package.created_at)).limit(15).all() packages = query.order_by(db.desc(Package.created_at)).limit(15).all()
return render_template("index.html", packages=packages, count=count) return render_template("index.html", packages=packages, count=count)
from . import users, githublogin, packages, sass, tasks, admin, notifications, tagseditor, meta from . import users, githublogin, packages, sass, tasks, admin, notifications, tagseditor, meta, thumbnails
@menu.register_menu(app, ".help", "Help", order=19, endpoint_arguments_constructor=lambda: { 'path': 'help' }) @menu.register_menu(app, ".help", "Help", order=19, endpoint_arguments_constructor=lambda: { 'path': 'help' })
@app.route('/<path:path>/') @app.route('/<path:path>/')

45
app/views/thumbnails.py Normal file

@ -0,0 +1,45 @@
# Content DB
# Copyright (C) 2018 rubenwardy
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
from flask import *
from app import app
import glob, os
from PIL import Image
ALLOWED_RESOLUTIONS=[(332,221)]
def mkdir(path):
if not os.path.isdir(path):
os.mkdir(path)
@app.route("/thumbnails/<img>")
@app.route("/thumbnails/<int:w>x<int:h>/<img>")
def make_thumbnail(img, w=332, h=221):
if not (w, h) in ALLOWED_RESOLUTIONS:
abort(403)
mkdir("app/public/thumbnails/")
mkdir("app/public/thumbnails/332x221/")
cache_filepath = "public/thumbnails/{}x{}/{}".format(w, h, img)
source_filepath = "public/uploads/" + img
im = Image.open("app/" + source_filepath)
im.thumbnail((w, h), Image.ANTIALIAS)
im.save("app/" + cache_filepath, optimize=True)
return send_file(cache_filepath)

@ -12,3 +12,4 @@ beautifulsoup4==4.6.0
lxml==4.2.1 lxml==4.2.1
Flask-FlatPages==0.6 Flask-FlatPages==0.6
Flask-Migrate==2.1.1 Flask-Migrate==2.1.1
pillow==5.1.0