changeset 2611:e5f2854c74c5

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 07 Jun 2014 23:26:25 +0200
parents dd69c432b8ea (current diff) 3334da53527e (diff)
children a8bf7c1d94fb
files
diffstat 5 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/converter/audio_video_in.py	Mon Jun 02 23:16:46 2014 +0530
+++ b/MoinMoin/converter/audio_video_in.py	Sat Jun 07 23:26:25 2014 +0200
@@ -41,7 +41,11 @@
 
 from . import default_registry
 from MoinMoin.util.mime import Type, type_moin_document
+default_registry.register(Converter._factory, Type('video/mp4'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/ogg'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/webm'), type_moin_document)
+
+default_registry.register(Converter._factory, Type('audio/mpeg'), type_moin_document)
 default_registry.register(Converter._factory, Type('audio/ogg'), type_moin_document)
-default_registry.register(Converter._factory, Type('audio/wave'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/webm'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/x-wav'), type_moin_document)
--- a/MoinMoin/items/content.py	Mon Jun 02 23:16:46 2014 +0530
+++ b/MoinMoin/items/content.py	Sat Jun 07 23:26:25 2014 +0200
@@ -585,7 +585,7 @@
 
 @register
 class WAV(Audio):
-    contenttype = 'audio/wave'
+    contenttype = 'audio/x-wav'
     display_name = 'WAV'
 
 
--- a/MoinMoin/script/maint/index.py	Mon Jun 02 23:16:46 2014 +0530
+++ b/MoinMoin/script/maint/index.py	Sat Jun 07 23:26:25 2014 +0200
@@ -8,6 +8,7 @@
 
 from flask import current_app as app
 from flask.ext.script import Command, Option
+from flask import g as flaskg
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
@@ -52,6 +53,7 @@
     ]
 
     def run(self, tmp, procs, limitmb):
+        flaskg.add_lineno_attr = False  # no need to add lineno attributes while building indexes
         app.storage.rebuild(tmp=tmp, procs=procs, limitmb=limitmb)
 
 
--- a/MoinMoin/script/maint/reduce_revisions.py	Mon Jun 02 23:16:46 2014 +0530
+++ b/MoinMoin/script/maint/reduce_revisions.py	Sat Jun 07 23:26:25 2014 +0200
@@ -18,6 +18,8 @@
 
 from MoinMoin.constants.keys import NAME, NAME_EXACT, REVID
 
+from MoinMoin.app import before_wiki
+
 
 class Reduce_Revisions(Command):
     description = "This command can be used to remove all revisions but the last one from all selected items."
@@ -27,6 +29,7 @@
     )
 
     def run(self, query):
+        before_wiki()
         if query:
             qp = app.storage.query_parser([NAME_EXACT, ])
             q = qp.parse(query_text)
--- a/make.py	Mon Jun 02 23:16:46 2014 +0530
+++ b/make.py	Sat Jun 07 23:26:25 2014 +0200
@@ -359,6 +359,11 @@
             print 'Success: Modernized and Foobar CSS files updated.'
         else:
             print 'Error: stylus failed to update css files, see error messages above.'
+        # stylus adds too many blank lines at end of modernized common.css, fix it by running coding_std against css directory
+        command = 'python contrib/pep8/coding_std.py MoinMoin/themes/modernized/static/css'
+        result = subprocess.call(command, shell=True)
+        if result != 0:
+            print 'Error: failure running coding_std.py against modernized css files'
 
         print 'Running lessc to update Basic theme CSS files...'
         data_loc = get_bootstrap_data_location().strip()