From 8208971f76113fa129f3adb5bf651b465f8736e0 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Sat, 3 Dec 2022 01:00:29 -0800 Subject: [PATCH] get videos working for thumbnail and render --- nerochan/models.py | 35 +++++++++++++++++++++++---- nerochan/static/css/main.css | 11 +++++++++ nerochan/static/images/play.png | Bin 0 -> 3299 bytes nerochan/templates/artwork/show.html | 17 ++++++++++--- requirements.txt | 2 ++ 5 files changed, 56 insertions(+), 9 deletions(-) create mode 100644 nerochan/static/images/play.png diff --git a/nerochan/models.py b/nerochan/models.py index 7a03eef..d5e43d1 100644 --- a/nerochan/models.py +++ b/nerochan/models.py @@ -2,7 +2,9 @@ from os import path from datetime import datetime from secrets import token_urlsafe +from flask import url_for from PIL import Image, ImageSequence, ImageFilter +from cv2 import VideoCapture import peewee as pw @@ -92,18 +94,29 @@ class Artwork(pw.Model): @property def thumbnail(self): - return f'thumbnail-{self.image}' + res = f'thumbnail-{self.image}' + if self.is_video: + return f'{res[:-3]}.png' + else: + return res + + @property + def is_video(self): + if self.image.endswith('.mp4') or self.image.endswith('.webm'): + return True + else: + return False def generate_thumbnail(self): - is_gif = self.image.endswith('.gif') _t = self.thumbnail i = f'{config.DATA_PATH}/uploads/{self.image}' t = f'{config.DATA_PATH}/uploads/{_t}' try: size = (150,150) - image = Image.open(i) - if is_gif: + if self.image.endswith('.gif'): + image = Image.open(i) frames = ImageSequence.Iterator(image) + image.close() def thumbnails(frames): for frame in frames: thumbnail = frame.copy().convert('RGBA') @@ -116,12 +129,24 @@ class Artwork(pw.Model): _image.info = image.info _image.save(t, save_all=True, append_images=list(_frames), disposal=2) _image.close() + elif self.is_video: + cap = VideoCapture(i) + _, frame = cap.read() + image = Image.fromarray(frame) + if self.nsfw: + image = image.filter(ImageFilter.GaussianBlur(radius = 6)) + pb = Image.open('nerochan/static/images/play.png') + image.paste(pb, (int(image.width / 2) - int(pb.width / 2), int(image.height / 2) - int(pb.height / 2))) + pb.close() + image.save(t, format=image.format) + image.close() else: + image = Image.open(i) image.thumbnail(size, Image.ANTIALIAS) if self.nsfw: image = image.filter(ImageFilter.GaussianBlur(radius = 6)) image.save(t, format=image.format) - image.close() + image.close() self.save() return True except Exception as e: diff --git a/nerochan/static/css/main.css b/nerochan/static/css/main.css index b53f34c..f1d99bd 100644 --- a/nerochan/static/css/main.css +++ b/nerochan/static/css/main.css @@ -20,6 +20,17 @@ a, a:visited { margin-top: 4em; } +.inline { + display: inline; +} + +.nsfw { + color: red; + border: 1px solid red; + border-radius: 4px; + padding: 4px; +} + .button { color: white; border: 1px solid white; diff --git a/nerochan/static/images/play.png b/nerochan/static/images/play.png new file mode 100644 index 0000000000000000000000000000000000000000..9f41dee6426694bca624272e101dcaf16643d0e6 GIT binary patch literal 3299 zcmV<93>@=`P)^1-Z42(%cK~#9!?VVqDqC61B(-iM()813i`v#W#=;FPt z`u)Gkt5RDC`7=o-DZDEedp756<=1Cpm}h1}NZnn0*)a$ym)ln8uf~e%dC2xPV3@&t=Fdy>k{IOix}W8Penlp$ppDv+2xO7 zZ9$G1o}2Fc`g!KN%9@kz`Wj@^NE{DWe^>sRw{6EK;hu+WE7r^=Zv1R`gl8eZxEgIf2`yl_=T$=|a0FcS z|6@)~eDY8yFh|E#&)O?399JtaN5)m%gzt%+Pafv+>y9@ zL6C5XV9rj{hAV&Ib4$>0v+YRUKwSCvZ(4$fOR~}O8;Cplnh{J~q75H#aE}5Pmxx0| z+-E_MakE`K+$Ja3xP-h#!`&D7xRe|s;XczCxCM=adkJh};O1{GxZpgnu`NG zO9IAy7O`;Uha3089nJ@ykyyASdjltR2rzAP6!CE7SciMyGDWNq3s-(vc;Jq|XYp`J zb^zv}2q?=`iMY6A2h2g~a3u#pBI8Pn8F$1TUKNRrD@DFRxIE8eD&5H!MMTvy_Oq1YJ99*6kNpMy2df-+x5iW(`TKhpV>;P9gEbYA{#FinwKG4$O z?(F$fVrySnkz}~TN1GRJBhujx12Yc9W#dpR4K8V!BrgPaEN&{?Y-7t#6LbFgB`Gcu zVYr<`ONX14mSj3HrpqgHQVjo>*;$h5X578`9_tnxcaV{U;P&T2L(TUnpV61O2XpS9 zn6mp%mfBd^`FTuSYR>%|adXQ($}XLbiJKpsaEEijs_r!bfx1vEjHL=<$dK*}tGd_R z8E!(78FBUTF1K|obgSeZ*U4p%4&gbI7G3i_${0R*YwD0R;93*9U(cW>!_A)_;JDIU zfT;UZ5JK`okA{X$qU|Al7eIBt%WX)wTQA%rfvS5eW@0(b@odoG%5wpz?pOL3E1CZ2 zfm;cjA3UOu_I)o4S|ji-s#exNMx>hpT&@zBEQ<1%%rOXLYZsN+jHkuI5VARn>RluI{aS z4MZql{a2w&R?s@v67~`D-?w^GAq;m5#(g1S>V8e%z?2z- z;;u-by4~~*!&N17l(<|3t9zZkfw+%K+;Oi^11+&rEAWRJaKo+J z!h}1hNFb;iZryUGXm23Oq&b4R!PYH5fN(j*Q8(DSl_1=P;;4HI9=vfMkZ~>QegzNS zxC;>OQ-P&!H+}tmJP3DRps9PEzTUXwr9p*T;HewdGM66!xSS%Y8&-8I0k{ptR5z&V z_JE5EQ8%ROwgBM1qt4y1sv7|JslZh?pz1bS8g3a#Cg-6;<6RW%){D^jAUtQo4$W{k zfnweI|9cu-F3{EWw{DMCT$i>ysJhQBeX}-OKd#z};GLUq}pf zFVok@7>}BzW!xi)qHec0-nk``VdA=|d+T{{!#&t=vsmihw!9(W_MQ?VmbyMwx88F? zjmt$eb$zOCf91}3qI^n3QP-pDw!y@8RoA`hX2Y#ws_R~L+l_El!8vZc8(`h2B|Lv| z3ZmU{U9B4?u7|pg)@^0MJw{g7(Ymb|BCe0RZq{veFypSGtLxM-iHhr|u1mwD4VT1M z*QH@{Rhn@{0(Bi4CM~#Jq)^wPVe%0X*IQk9)$Oklw@ITeyy~_=#PwGfTy@(_LtSXq zZ7S*lt8P0*2C^5OyJZ7HaADSMF$j3O@VpnDJK^R*xFG9h#!aa%$huk7EfT5=v2K{S zf$Bo6+mzG=G)zuPU3+X~LQ*H3` zRl0b$1~psmjNy5e%uN9MpfGU*)rEAKO-Ef&58rO)UhVFL|9^RgCzLGC%yML@GLRWg z26ATk-8xI5?h{(}d}g(Y6qTP0uktgsx*AhtAbY(n`{?nm(_X>ewkrP9Akh03#C8*I zJ28o+pW!{Sx>j>G9Bwh&FFe$B+(nFv>#nZdoY}fXX5EVux6{e_WwSQiY4wq1e+TQ> zGHI9I6IPdAZ{b}GkS;r*ae!;QkZbOS8+){-* ze(TT*C*BP`{GtDrB-2ZhUU1xmk2xFQG8pc~|AedSw{^8QlwS<0!)*kDx_;)YKimLu zC;i5(*}so$8gF~cYAEiz2vis2U3xn(?#$j)IJ5Ua&h0Ime?)+~>EB@*^oH1sV&HBZ zaCz&mu4Cm)Gjw|YZou1(T`OlgT&BVON%!`n9N%~s{0>RWkPcZ#;rS4^A%1Qm(474Y zADnPuC-RQf4KruzPv(G^;2*uz4K!yxT;_&5*?0C2nlVPTVHb7rPDCIZN8CA_HxYK4 z$5ZOlJmz**3L6BGPU^zj8tp^qNi=M zG#g;*`d7}BxXcH)66ANzR~yd->q#`XJTEBTMKNdJLsifZIVf@ubQ3t{><5?m;Z_u+ zE|NL>9xiG>+#04Xjyd}tDh(jssi8>b>}S{~VK!VgG+tJ9fB8&S*As6uf{W{T;_U$U zdHUxG4`+i#UH7&|+tBs2=HERFdvN3kcg3B-N#jzc7aIuL0b2vlaUbBmh@`k;C@utd z8Q63iFdQ6V2*s5W=?QULIc3fa8A#dw^vdQKSvtSgCi7{{%Ya^&;GwGd#uXRdJQ6%q zwTHOk)_E#i<J#IyOe3OO!n|xiQCoq;@~RMVxhQQoE`^vQRCy<)4je!a)^N& z-qxtekiOM1a4+As7`Vz{0Ri_s9U|b8Lo8gLqSwdh%LN?6b>n*+W2}5Wm@y3Dx!!4V6k|+2>NL1@vkJFvt@>#e1GjFnQ0vyN>vXs` zUT@rXQK!WH;`PPVX&Vi<#$T^}$^U)e6Q@ak(-=`y}qT zIaRv{TwJxxueod0jjYu^1shk*%dY~%YdiEqH)FAJH39oYU?{Fe+Tm6MBwP(II|~d- zR%beCrS5VpTStS zLQmEYNQ-;^m#3m_Te(jwYuoMmqXztV3|wX-&MwG#cb)&*()EY=XIM;JyUfei)9G_v z6zk%2IsyK9T-;@idM#t)E^%q2<1SHYUu zEC|%^z5%#?D{#n-?znf{e;b!CA

{{ artwork.title }}

-
- posted by {{ artwork.user.handle }} - {{ artwork.upload_date | humanize }} -
+ +

NSFW

+
+ posted by {{ artwork.user.handle }} - {{ artwork.upload_date | humanize }} +
+

{{ artwork.description }}

{% if current_user.is_authenticated and current_user.is_admin %} @@ -28,7 +31,13 @@
- + {% if artwork.is_video %} + + {% else %} + + {% endif %}
diff --git a/requirements.txt b/requirements.txt index 61abebd..d61be55 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,6 +18,8 @@ Jinja2==3.1.2 MarkupSafe==2.1.1 mccabe==0.7.0 monero==1.1.1 +numpy==1.23.5 +opencv-python-headless==4.6.0.66 packaging==21.3 peewee==3.15.4 Pillow==9.3.0