heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing unnecessary "setup_plugin()" calls, as pointed out by Velmont.

Browse Source
This commit is contained in:
Christopher Allan Webber 2013-08-25 13:59:34 -05:00
parent 6c3d383bbb
commit 7b12cbd98b
5 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/media_types/ascii/__init__.py
View File

@ -17,16 +17,11 @@
from mediagoblin.media_types import MediaManagerBase from mediagoblin.media_types import MediaManagerBase
from mediagoblin.media_types.ascii.processing import AsciiProcessingManager, \ from mediagoblin.media_types.ascii.processing import AsciiProcessingManager, \
sniff_handler sniff_handler
from mediagoblin.tools import pluginapi
ACCEPTED_EXTENSIONS = ["txt", "asc", "nfo"] ACCEPTED_EXTENSIONS = ["txt", "asc", "nfo"]
MEDIA_TYPE = 'mediagoblin.media_types.ascii' MEDIA_TYPE = 'mediagoblin.media_types.ascii'
def setup_plugin():
config = pluginapi.get_config(MEDIA_TYPE)
class ASCIIMediaManager(MediaManagerBase): class ASCIIMediaManager(MediaManagerBase):
human_readable = "ASCII" human_readable = "ASCII"
display_template = "mediagoblin/media_displays/ascii.html" display_template = "mediagoblin/media_displays/ascii.html"
@ -39,7 +34,6 @@ def get_media_type_and_manager(ext):
hooks = { hooks = {
'setup': setup_plugin,
'get_media_type_and_manager': get_media_type_and_manager, 'get_media_type_and_manager': get_media_type_and_manager,
('media_manager', MEDIA_TYPE): lambda: ASCIIMediaManager, ('media_manager', MEDIA_TYPE): lambda: ASCIIMediaManager,
('reprocess_manager', MEDIA_TYPE): lambda: AsciiProcessingManager, ('reprocess_manager', MEDIA_TYPE): lambda: AsciiProcessingManager,

7
mediagoblin/media_types/image/__init__.py
View File

@ -19,7 +19,7 @@ import logging
from mediagoblin.media_types import MediaManagerBase from mediagoblin.media_types import MediaManagerBase
from mediagoblin.media_types.image.processing import sniff_handler, \ from mediagoblin.media_types.image.processing import sniff_handler, \
ImageProcessingManager ImageProcessingManager
from mediagoblin.tools import pluginapi
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
@ -28,10 +28,6 @@ ACCEPTED_EXTENSIONS = ["jpg", "jpeg", "png", "gif", "tiff"]
MEDIA_TYPE = 'mediagoblin.media_types.image' MEDIA_TYPE = 'mediagoblin.media_types.image'
def setup_plugin():
config = pluginapi.get_config('mediagoblin.media_types.image')
class ImageMediaManager(MediaManagerBase): class ImageMediaManager(MediaManagerBase):
human_readable = "Image" human_readable = "Image"
display_template = "mediagoblin/media_displays/image.html" display_template = "mediagoblin/media_displays/image.html"
@ -67,7 +63,6 @@ def get_media_type_and_manager(ext):
hooks = { hooks = {
'setup': setup_plugin,
'get_media_type_and_manager': get_media_type_and_manager, 'get_media_type_and_manager': get_media_type_and_manager,
'sniff_handler': sniff_handler, 'sniff_handler': sniff_handler,
('media_manager', MEDIA_TYPE): lambda: ImageMediaManager, ('media_manager', MEDIA_TYPE): lambda: ImageMediaManager,

7
mediagoblin/media_types/pdf/__init__.py
View File

@ -17,16 +17,12 @@
from mediagoblin.media_types import MediaManagerBase from mediagoblin.media_types import MediaManagerBase
from mediagoblin.media_types.pdf.processing import PdfProcessingManager, \ from mediagoblin.media_types.pdf.processing import PdfProcessingManager, \
sniff_handler sniff_handler
from mediagoblin.tools import pluginapi
ACCEPTED_EXTENSIONS = ['pdf'] ACCEPTED_EXTENSIONS = ['pdf']
MEDIA_TYPE = 'mediagoblin.media_types.pdf' MEDIA_TYPE = 'mediagoblin.media_types.pdf'
def setup_plugin():
config = pluginapi.get_config(MEDIA_TYPE)
class PDFMediaManager(MediaManagerBase): class PDFMediaManager(MediaManagerBase):
human_readable = "PDF" human_readable = "PDF"
display_template = "mediagoblin/media_displays/pdf.html" display_template = "mediagoblin/media_displays/pdf.html"
@ -39,7 +35,6 @@ def get_media_type_and_manager(ext):
hooks = { hooks = {
'setup': setup_plugin,
'get_media_type_and_manager': get_media_type_and_manager, 'get_media_type_and_manager': get_media_type_and_manager,
'sniff_handler': sniff_handler, 'sniff_handler': sniff_handler,
('media_manager', MEDIA_TYPE): lambda: PDFMediaManager, ('media_manager', MEDIA_TYPE): lambda: PDFMediaManager,

7
mediagoblin/media_types/stl/__init__.py
View File

@ -17,16 +17,12 @@
from mediagoblin.media_types import MediaManagerBase from mediagoblin.media_types import MediaManagerBase
from mediagoblin.media_types.stl.processing import StlProcessingManager, \ from mediagoblin.media_types.stl.processing import StlProcessingManager, \
sniff_handler sniff_handler
from mediagoblin.tools import pluginapi
MEDIA_TYPE = 'mediagoblin.media_types.stl' MEDIA_TYPE = 'mediagoblin.media_types.stl'
ACCEPTED_EXTENSIONS = ["obj", "stl"] ACCEPTED_EXTENSIONS = ["obj", "stl"]
def setup_plugin():
config = pluginapi.get_config(MEDIA_TYPE)
class STLMediaManager(MediaManagerBase): class STLMediaManager(MediaManagerBase):
human_readable = "stereo lithographics" human_readable = "stereo lithographics"
display_template = "mediagoblin/media_displays/stl.html" display_template = "mediagoblin/media_displays/stl.html"
@ -38,7 +34,6 @@ def get_media_type_and_manager(ext):
return MEDIA_TYPE, STLMediaManager return MEDIA_TYPE, STLMediaManager
hooks = { hooks = {
'setup': setup_plugin,
'get_media_type_and_manager': get_media_type_and_manager, 'get_media_type_and_manager': get_media_type_and_manager,
'sniff_handler': sniff_handler, 'sniff_handler': sniff_handler,
('media_manager', MEDIA_TYPE): lambda: STLMediaManager, ('media_manager', MEDIA_TYPE): lambda: STLMediaManager,

7
mediagoblin/media_types/video/__init__.py
View File

@ -17,17 +17,13 @@
from mediagoblin.media_types import MediaManagerBase from mediagoblin.media_types import MediaManagerBase
from mediagoblin.media_types.video.processing import VideoProcessingManager, \ from mediagoblin.media_types.video.processing import VideoProcessingManager, \
sniff_handler sniff_handler
from mediagoblin.tools import pluginapi
MEDIA_TYPE = 'mediagoblin.media_types.video' MEDIA_TYPE = 'mediagoblin.media_types.video'
ACCEPTED_EXTENSIONS = [ ACCEPTED_EXTENSIONS = [
"mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"] "mp4", "mov", "webm", "avi", "3gp", "3gpp", "mkv", "ogv", "m4v"]
def setup_plugin():
config = pluginapi.get_config(MEDIA_TYPE)
class VideoMediaManager(MediaManagerBase): class VideoMediaManager(MediaManagerBase):
human_readable = "Video" human_readable = "Video"
display_template = "mediagoblin/media_displays/video.html" display_template = "mediagoblin/media_displays/video.html"
@ -43,7 +39,6 @@ def get_media_type_and_manager(ext):
return MEDIA_TYPE, VideoMediaManager return MEDIA_TYPE, VideoMediaManager
hooks = { hooks = {
'setup': setup_plugin,
'get_media_type_and_manager': get_media_type_and_manager, 'get_media_type_and_manager': get_media_type_and_manager,
'sniff_handler': sniff_handler, 'sniff_handler': sniff_handler,
('media_manager', MEDIA_TYPE): lambda: VideoMediaManager, ('media_manager', MEDIA_TYPE): lambda: VideoMediaManager,