From fe4d1285df8e7bf40ce2636b2cbdfd533093ef5e Mon Sep 17 00:00:00 2001 From: yomguy Date: Tue, 5 Apr 2011 11:30:57 +0200 Subject: [PATCH] do not pre-analyze media when adding or editing an item, add CREM's novel / published collection filter --- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 11153 -> 11248 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 12 +++++++++ .../telemeta_default/collection_list.html | 3 +++ telemeta/urls.py | 12 ++++++--- telemeta/web/base.py | 24 +++++++++--------- 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 128887082d162df60826fe2e778ed2a992a64ddd..1a893c003c52d8e3da2e965cd53f2c450e3cf460 100644 GIT binary patch delta 4580 zcmYk=32;@_0f+Gm*$g2;kRWN11QNgmuz+aT5k&+61uIZnWivsLunSf}p2$*UDcA%> zhzf#~K-vfqM3y#61*B3@>%i2CmX1Q1>eQum5U1_;y>~Lh9sl{AbCR*M$6F-*Q3vE!4_DJws#m^ z#M7bv8M<f+NED zaYz%<6m-BbbdM}S?_U|*fKH&Q1?z7|yEx&9_oE}L3pc)xc6b)u?f*pYOT9YLL1W}~ zMorOywnMLX3--W5>iy6TCx`Ph(dXvHD7eHcuoqV1m3Rtm=zO^T1=2T5l9OajkpH6D{Bb2#qAR-=9mqy>;;}6he4rYAcl*%+9YJS)8ePJ(=!5?Veu+MJ z5gl+E%flF>mgq`!L9h2kS9EANKNg+XRAh6;qFEFi;aqftkD?DQ4fS&LyMI2^HwUZH z=Uznzeh_`f$IyYELTC6fI+63}z`jBU@W1$V-hT?~<_xmXhH}v*?TD^Kf3%~K=t_*n zc6cA!!D956a~0Zf75ZFFsK1WhcNFO}I*D%f3z+HmpGwUUHb*;d9qQfCrR#%ynbDo- z5|^MWv>>xLUabp z(2m!j9X^N7xCULpJ?IJ@L09ZVxc(mc3Qvdg9|k{Z#rwD6Ps5F0pg$DfpbaMTYvDW1 z#)15!RDea)r|>V4{}@&9rvPiwr9F+V)K}<0(sC0M$U-OBB3Km8_sfkXW-y2oF7>eB zIJAM;=n6c7HoOR(@zdx}Yb83sP3V0!7~hoWWPOv8y z(0??Tg70=3+Tat&K8q^Q0qsT`stecO4)rtWOfH}ee}jIWjS3P2YKtAHcSfHdh2B2_ zy>F^@`i~Ze3#-w0`wS-GR&-$7(U~7Y8+sS{K%$S(SMnXYSNv6SW@+eVZh^K}h+e-D z^RO>Ekg*s`p)i?(GnkH!YzYp>N^~hNUffRrHeg+CxH7<0{2iUad2|3@hx5_3i4IfH zS9cXU&}-5AyP~hC5Bf@n#wa*|acIMn(2-6>J6wRycsbhOMs%PrqtCs9?7QdyI@6EQ zujO;}m8BPk&k=2}4cdNZbR}Z_DEMyfK^u4&({L%;;cC1BUqn}8C&o7;`nkP}Hh3Og ziHqnDPij%(Cpr)FsP_+!N50Hx5jOJs-%5df71bcW9nlBqX8IN#ac0NFrp&=~>Rp4q z(E;6x88`-Ak^9jBJ&3O8d~_uq4=%%o)K|r?^ZwUR$lyc;+TbR%q1|Xhuc5Etc<>`^ zK;7fP1kuAdE0o0*+(jCZ62kU~uks6c16f7pk-mQaBgq6(PHrY1?Gwaja5v?*LfwJA zK?V>9JA+(){F+KGxr6*9TsVMBLwP8=+7FQXNo+rVeotJY$z&nfLI#pN;=A`aO58BN zB)iGWr2d#qVF+}k_gF`N|0^kEke7&uo9q?xCoADt zhwg#viM!t8DRLdDBhQfANEVq%Jbp|36y0o35`Pgr<|l~%eUtv9ACZ&ckSkR_!4_yvX7?fm&Ed5m--{mH$=;|cN* z*+G6rc9NB({y0S8QPPC;A@`9RiN_-(pNt}#Nc}O9LfcRo<@k-_9~GL>{ESCTcv;~sJg`5k$k6cLY`;(zJCb-cj;IKZ`}OQ^5M=Sfd8 zEu4E1i%AlhL+&IwWDMy{wv+l}BZaM`A2}9I*5V?vEYxG}&MGpO>@Dxv^kT!Zvf3`q zIwU2}m{(d>J}P^A`iQv`%cjhkTv}55eRj9>)VpWQeW-L!ZRgz0N$EqTAFe8yLbd!v b+hZArpQL=as&q~?u>5a@&1-k$pG*5c0lcDd delta 4486 zcmYk;4|G;#0mtzN1{-q-@izo?12*O+TVjbcM3@2-!T2LEB|%9bY!HHpvj(psg#>}L z5eP&=h&Y3$lPEQXO`FZ2f=+q-L()l?Ck`i$o{r+-)c5<|XGibh_kNz|zV|-=?sMPq zpUTaZsZ%{WZ3!I5$Uw3tGlV`JLO9davmuP_5kfJR<7K!Q^Km_1f(_UcTQLjY!3=y4 zv+)D$jvvPFGq|`j^&I4UD)dMSVGwrVi{aP}%g_raVn>`3&re6j80KLoT!a_l63oGB z9F1$@_f6=)T97e>KcWLWjlJnV{F{Ouhh9m8**J`9H?+Y~=wei$Gns*QI3K-lDfY!` z?2Vi7V%!_+&!Q{Vf)4l$+U_~*LjU0c1v|*(ZZGJC&b%L9gO{Nro`qg_C#GkNu2eO8 z-&%A)8_-9v1)ce0=*)Mc9XF!)zlL!#5%S!Yn>)Z!unqHR$!*(TN+eWTa>9|HLK|$0^^edQUWj&Ooo!$M zaw-&{1003!iLvPQ713GffES?cFF{v!1v;RbzO27DY~q9s??QL={&-;%+QDncQwqn> z0iKTEpN)QmMVvp6c9{Rgq@!WzeOI9?Iswb@R{R3irYJa~z43y2q>b<*I6!R07oG0rb2lz0=Se=b|?*K?mUVF6COZp+}K7FVv$;+8paAv55K^bijQFB?BFRwp)na zml{FA3#OnmpMfKBHo5|}=!IL+rENe5^a^_YU(x&Dj`h>%=4wM%=3G2~0o_v>gOm1p zAe%E4iYc%$!+5lVdFV{x$O%qowGh9Elk? z9v#p`bfR-HhyKHI3T*hW3SH72=;qjs&S*dS`*0X-ur+@FH_W4c3hnrR=>6FR$ppHi z11rFraWuMe>#;NL#Pr|)Jro>S1KQE6=nA|M&!0sHm@zcje0k_n7GWo>Kv!rox-ymM zK<|p)gAQ;dI)JsYzHKP$Z-;w0;jTV}-uM!_n_ov8d<)%#ZRoS}IoMD)^cOBS*2^%H z`XqG8r(+h*iq1v%)Izk~>O$7v8LZ)iGgyZXpbkC18|`o(x%o9bSq~xCm|U+7tyxIt{&XCbF->?P$jjqHo7W?2Ps33>we|o6ru9 zqbu=u^wFG0@9$TXtiVvT!&2;mH=ymLCR0f7M)dVsjyAXsU5V}J56zRvuV^@mdH8O$ zLoxp!q&^s3k@3iO2~&|*KCD3Z(l&I!2hmOWJZAg;pGXSfZFEHMqZfXRu1KdVk^$wQ zk7OXa5`&_J*pYfk{QgSJp?)>mUOC#%E$GB%qmQ5}Ezf@yg$|tX_+~=*4t_h9C5s#+ z7m;~nDDjQhNxnkXk$cItWD1!}9wp_(!xiyx0@KLvtZ-!d{=ZDd5=Xa~eE!%=#buvN zX2vgmjjLmMBIc9%}3=adHF6B|dwPSBQ@_wVsb(k^`juSW2OSxJueUVPDJ0ljK&ipQIk)qy2cE!u{k| zWE7cAt|lHU$Y3&^{FJmGcTgA-ne-zw z$T0E*X+O46*iA;0SL4YBTtyy^^%~qqmXpTXyL)`nxUgqIM(yT4`x?vp4$p3UAouZ% U+95+)I*h9wRNT8UJHIXK|NBLTq5uE@ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 6e5b553b..6f6740c1 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -888,3 +888,15 @@ msgstr "Dernière connexion" #: templates/telemeta_default/login.html:21 msgid "Password forgotten" msgstr "Mot de passe oublié" + +#: templates/telemeta_default/collection_list.html:9 +msgid "All" +msgstr "Toutes" + +#: templates/telemeta_default/collection_list.html:10 +msgid "Novel" +msgstr "Inédites" + +#: templates/telemeta_default/collection_list.html:1& +msgid "Published" +msgstr "Éditées" diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html index 8fd8ae22..3168c6d1 100644 --- a/telemeta/templates/telemeta_default/collection_list.html +++ b/telemeta/templates/telemeta_default/collection_list.html @@ -6,6 +6,9 @@ {% block submenu %}
+ {% trans "All" %} + {% trans "Novel" %} + {% trans "Published" %} {% if user.is_authenticated and perms.telemeta.add_mediacollection %} {% trans "Add" %} {% endif %} diff --git a/telemeta/urls.py b/telemeta/urls.py index 500aa278..93dc42be 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -50,6 +50,10 @@ web_view = WebView() all_items = { 'queryset': MediaItem.objects.enriched(), } all_collections = { 'queryset': MediaCollection.objects.enriched(), } +# CREM collections +all_collections_novel = { 'queryset': MediaCollection.objects.filter(code__contains='_I_'), } +all_collections_published = { 'queryset': MediaCollection.objects.filter(code__contains='_E_'), } + # ID's regular expressions export_extensions = "|".join(web_view.list_export_extensions()) @@ -97,9 +101,11 @@ urlpatterns = patterns('', # collections url(r'^collections/$', 'django.views.generic.list_detail.object_list', - dict(all_collections, paginate_by=20, - template_name="telemeta/collection_list.html"), - name="telemeta-collections"), + dict(all_collections, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections"), + url(r'^collections_novel/$', 'django.views.generic.list_detail.object_list', + dict(all_collections_novel, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-novel"), + url(r'^collections_published/$', 'django.views.generic.list_detail.object_list', + dict(all_collections_published, paginate_by=20, template_name="telemeta/collection_list.html"), name="telemeta-collections-published"), url(r'^collections/?page=(?P[0-9]+)$', 'django.views.generic.list_detail.object_list', dict(all_collections, paginate_by=20)), diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 86708d4f..e488e9f5 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -324,7 +324,7 @@ class WebView(object): form.save() if form.files: self.cache_data.delete_item_data(code) - self.item_analyze(item) +# self.item_analyze(item) item.set_revision(request.user) return HttpResponseRedirect('/items/'+code) else: @@ -405,18 +405,18 @@ class WebView(object): subpipe = analyzer() analyzers_sub.append(subpipe) pipe = pipe | subpipe - if not self.cache_data.exists(image_file): - path = self.cache_data.dir + os.sep + image_file - for grapher in self.graphers: - if grapher.id() == grapher_id: - break - graph = grapher(width = int(width), height = int(height)) - pipe = pipe | graph +# if not self.cache_data.exists(image_file): +# path = self.cache_data.dir + os.sep + image_file +# for grapher in self.graphers: +# if grapher.id() == grapher_id: +# break +# graph = grapher(width = int(width), height = int(height)) +# pipe = pipe | graph pipe.run() - if not self.cache_data.exists(image_file): - f = open(path, 'w') - graph.render(path) - f.close() +# if not self.cache_data.exists(image_file): +# f = open(path, 'w') +# graph.render(path) +# f.close() mime_type = decoder.format() analyzers.append({'name': 'Mime type', 'id': 'mime_type', 'unit': '', 'value': mime_type}) analyzers.append({'name': 'Channels', 'id': 'channels', 'unit': '', 'value': decoder.channels()}) -- 2.39.5