From 25d44c703c5d27e0b69decec639a6e0bae71969d Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 6 Feb 2012 12:29:46 +0100 Subject: [PATCH] * Add media type detection from mime_type * fix icons * fix auto item.code when copy --- example/sandbox_mysql/settings.py | 1 + telemeta/htdocs/images/fonds.png | Bin 543 -> 1634 bytes telemeta/htdocs/images/playlist_title.png | Bin 493 -> 363 bytes telemeta/models/media.py | 2 -- .../templates/telemeta/mediaitem_detail.html | 2 +- telemeta/templatetags/telemeta_utils.py | 12 ++++++++++-- telemeta/views/base.py | 6 +++++- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/example/sandbox_mysql/settings.py b/example/sandbox_mysql/settings.py index 08975216..7116486e 100644 --- a/example/sandbox_mysql/settings.py +++ b/example/sandbox_mysql/settings.py @@ -101,6 +101,7 @@ INSTALLED_APPS = ( 'django.contrib.admin', 'telemeta', 'jsonrpc', + 'south', ) TEMPLATE_CONTEXT_PROCESSORS = ( diff --git a/telemeta/htdocs/images/fonds.png b/telemeta/htdocs/images/fonds.png index 89850c61c6184ed072b54782c333beddeed3e83d..32313a67e9fde16ee558ba883f5e793cc511c1a1 100644 GIT binary patch delta 1579 zcmV+`2GseV1mX;kN`D)#000}W0bUxB8~^|S2XskIMF-ph1`821h`T}z000HzNkl zVk%EQv`^O>%X_K%r+2$K3^2ilp@b4tTwnb=l=G-PUn!BIUlphat3{?+1xrH z@~cv0YX%sgKn--<4@{eV?@#Ua>HiCWuQwWB8dd$PLhG747tN^LDMi?zN<)Ns_e(SG zUwO0L{$Qm5^nYHRPZmYrkm?^4TBl;<-MYrp;vIJmRTUqa(I>KYNcDFu)$l+8Y*Kv@ z*mT8=(=jqC!YWlVU{Hh+RZi43*WD>$+p|Tn^ML}$MRrGb&YCf#N|0{EvecgeEfLPg z2tXnjUwG*!dSqS#l% z*D7}mXn%@K)-e87yZymE)8?|-)zJ`QpUBSDs+b5fX54UR9vD_-ttvJ6MYA9NtEvtz zw((q9?#kiiTked7fC3%p%V79qUGK~87o+`E^^5U5Z>&-M$)HI7P`HhGHUYWm{?^~C z>Nj_Z@e`!9RiM9HxX9pfRh9c?0cI8tR@Kjr)_?W*q}i{h+)uV4&Ud%6H|(Egi6o2X z!+a@1eVf=6-S-JI^K3axH8VeIcK9e9R@H2C2w&I|!XHbKjdTr;tEwy(B~_IIcJ$bO z&5Y1Z;pq!8?gdzJ>2!CSGW&3C2vdC`-*iAlKD8-?vZeZuOYW7syQ<3WqWD26^5ZlH zgMW$Z?!P?|1S-0RAhMa-jE zBCJ!TKUK^&aJ;UMEM;rO9C)fIR*!_Rzkgq3^qLvRVr0sl)#+?7D8iH(=gr80RU$~Y zW*j~fB(H(7A^`{LOn|0?{j2N&%m4`&=PtW=gXo+w#My{kV^o#twshWKv0H4mX zRs+5Za6T=*IxU)u&`3hnm%g_|I2U72LAN}W=g)m20FQ+5bPySs2d3Q_6rm|XmVd~U zr{6(@Ai{tul{+`xdmwh*lZ2`&+w**LDKa+ae(qpZom*I33fN6ocB$NHs!}HJZIL&9 zKum<3O<>)9(_I1VD9a~@RbOwwHcN%$8)dowy4l`&IMo#Sb_RPaX@Ae_;(yETZFY+g z(!1AZP%a5zyeuCbQGL5|A3EC=iho{ww-2ap@A&Ns8C0smkEO zk{lQm*;~WVgc)m8*%$&Ns$4d^!+1Nrdj-fBfLlB^roNsS&AA`A1AwX)z|L!C46D)- zAy0?RAysD6jx13LnN0*+N(L);rra4(MZ1eno{aI$r9zNr&}YdjNnZ5+Uw<{jy53H= zVL!0WVOuF8W2#(or#53SF+bIPCd_E1ENOSM=HfE`<&{*}+-rqFeujZo2e#mu@bFf*qVhI#dvxlp-zNU4=u>x+D-oW13u| z4!$WoUhaK)`MrC0@Nd6tDX*iR&Nz=}zzOgMw1kqUNdTn14u8uq-N~JpqGg!b!Bq9) z1~7d5$8-7;1NbpBef%xgFK}$)w@5vmv49#-0dl|y=mKq_3;{m;3@a02U%7FV7lCDW62UKm#ZN5B4Nn zw1*MEJFsnU%kfS_*BJJivVYl&P;x1e^ML*3y?}v~B3MTAim(w7f0y)`uoMu#nKVE@ zAike8Krv4z=R!%5_|0fARXxiv`@jmY4BP-mNhJRh_6gLu Vc@BG$vnK!m002ovPDHLkV1m$z)rtTB diff --git a/telemeta/htdocs/images/playlist_title.png b/telemeta/htdocs/images/playlist_title.png index b0547d69b53436ee5005faea71c29cc625b6e2f4..5e30362d4adcb558383e031773c574afef445340 100644 GIT binary patch delta 289 zcmV++0p9-Y1M32iHwpg${{a7>y{D6rKp=kx3mhZ9#<_+7008SrL_t(o!|hi)4#F@D zeWa0!xB>$QU@qJwd)KmZ4A%A#IS3NX%mFwAsFfPQ(n?j7q7>E1Ks-g3V?TeMWCQ;$ zE1R-N(lY=7AX_Mo0w62hUcLe-l5__^0yq#QTmul5ZXbh!83vTW(fgKTMPiga_t1a# zZN~Uhz4g_sfG{n~uAu@UY%Q=391)29@Zc`iW!K=u*FOUq{*GibHH5AX785=<_|jll zsLW@zAQ%8b8oF128bl}>BGNF@Fw!v6Ff{{5+jsEOEXoJ5Wlb#=C$kOO00000NkvXXu0mjf($#u^ delta 420 zcmV;V0bBm-0__8kHwgd$0002_L%V;GKp=ks3@`!8554dJ00C`DL_t(o!|j(%O2beT zg}?sLige%tN*y>VjU-`v~&T2MNEsWlk?ya5~Rrs zQOt!0kITzF=l+Fz;lE4GTy7d|TkiuNaN!7N286)GDDJ)@0GhFfr+Rn^1i-69XK#Oj zYdN+s$~b`#nCmQosUz?!Ib<*fNd$a(J_qiB4X^^%Il()?1JD9S!thNxYyzHGE(QJq zM8GyDfluHa=*xB>tO-EfdT0u6D$gSk+2uSN*;-jCJx{9vBWroSOX!$=hA1>*sXR89 zdfEShW}bh?0aDLOpjLDQN>4#W;HQ5Y*gI^)zZn5nozeacZFo{<3bw#o)rM6Y9uk3$ zCK(r{{ item }}

{% trans "Technical data" %}

-
{% trans "Media type" %}
{% trans "Audio" %}
+
{% trans "Media type" %}
{% trans mime_type|mime_to_media_type %}
{% dl_field item "approx_duration" %}
diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index 6aa86846..c096498d 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -379,6 +379,14 @@ def capitalize(value): @register.filter @stringfilter -def mime_to_ext(mime): - return mime.split('/')[1] +def mime_to_ext(mime_type): + return mime_type.split('/')[1] + +@register.filter +@stringfilter +def mime_to_media_type(mime_type): + if 'video' in mime_type: + return 'Video' + else: + return 'Audio' diff --git a/telemeta/views/base.py b/telemeta/views/base.py index a759034a..823dcf10 100644 --- a/telemeta/views/base.py +++ b/telemeta/views/base.py @@ -735,7 +735,11 @@ class ItemView(object): return HttpResponseRedirect('/archives/items/'+code) else: item = MediaItem.objects.get(public_id=public_id) + items = MediaItem.objects.filter(collection=item.collection) + item.code = auto_code(items, item.collection.code) form = MediaItemForm(instance=item) + form.code = item.code + form. d form.file = None return render(request, template, {'item': item, "form": form}) @@ -803,7 +807,7 @@ class ItemView(object): unit=analyzer.unit(), value=str(value)) analysis.save() - #FIXME: parse tags on first load +# FIXME: parse tags on first load # tags = decoder.tags return mime_type -- 2.39.5