piwigo: Move tool functions into tools.py

diff --git a/mediagoblin/plugins/piwigo/tools.py b/mediagoblin/plugins/piwigo/tools.py
new file mode 100644 (file)
index 0000000..d2f7da1
--- /dev/null
+++ b/mediagoblin/plugins/piwigo/tools.py
@@ -0,0 +1,106 @@
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2013 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+
+import lxml.etree as ET
+from werkzeug.exceptions import MethodNotAllowed
+
+from mediagoblin.tools.response import Response
+
+
+_log = logging.getLogger(__name__)
+
+
+class PwgNamedArray(list):
+    def __init__(self, l, item_name, as_attrib=()):
+        self.item_name = item_name
+        self.as_attrib = as_attrib
+        list.__init__(self, l)
+
+    def fill_element_xml(self, el):
+        for it in self:
+            n = ET.SubElement(el, self.item_name)
+            if isinstance(it, dict):
+                _fill_element_dict(n, it, self.as_attrib)
+            else:
+                _fill_element(n, it)
+
+
+def _fill_element_dict(el, data, as_attr=()):
+    for k,v in data.iteritems():
+        if k in as_attr:
+            if not isinstance(v, basestring):
+                v = str(v)
+            el.set(k, v)
+        else:
+            n = ET.SubElement(el, k)
+            _fill_element(n, v)
+
+
+def _fill_element(el, data):
+    if isinstance(data, bool):
+        if data:
+            el.text = "1"
+        else:
+            el.text = "0"
+    elif isinstance(data, basestring):
+        el.text = data
+    elif isinstance(data, int):
+        el.text = str(data)
+    elif isinstance(data, dict):
+        _fill_element_dict(el, data)
+    elif isinstance(data, PwgNamedArray):
+        data.fill_element_xml(el)
+    else:
+        _log.warn("Can't convert to xml: %r", data)
+
+
+def response_xml(result):
+    r = ET.Element("rsp")
+    r.set("stat", "ok")
+    _fill_element(r, result)
+    return Response(ET.tostring(r, encoding="utf-8", xml_declaration=True),
+                    mimetype='text/xml')
+
+
+class CmdTable(object):
+    _cmd_table = {}
+
+    def __init__(self, cmd_name, only_post=False):
+        assert not cmd_name in self._cmd_table
+        self.cmd_name = cmd_name
+        self.only_post = only_post
+
+    def __call__(self, to_be_wrapped):
+        assert not self.cmd_name in self._cmd_table
+        self._cmd_table[self.cmd_name] = (to_be_wrapped, self.only_post)
+        return to_be_wrapped
+
+    @classmethod
+    def find_func(cls, request):
+        if request.method == "GET":
+            cmd_name = request.args.get("method")
+        else:
+            cmd_name = request.form.get("method")
+        entry = cls._cmd_table.get(cmd_name)
+        if not entry:
+            return entry
+        func, only_post = entry
+        if only_post and request.method != "POST":
+            _log.warn("Method %s only allowed for POST", cmd_name)
+            raise MethodNotAllowed()
+        return func

diff --git a/mediagoblin/plugins/piwigo/views.py b/mediagoblin/plugins/piwigo/views.py
index 7c5bff3bb53c152eb04d0805a433bdd2303abcae..2b6b7b0cb5d491c3dab2663a07313870bac20ea6 100644 (file)
--- a/mediagoblin/plugins/piwigo/views.py
+++ b/mediagoblin/plugins/piwigo/views.py
@@ -16,98 +16,17 @@
 
 import logging
 
-import lxml.etree as ET
 from werkzeug.exceptions import MethodNotAllowed
 from werkzeug.wrappers import BaseResponse
 
 from mediagoblin.meddleware.csrf import csrf_exempt
-from mediagoblin.tools.response import Response, render_404
+from mediagoblin.tools.response import render_404
+from .tools import CmdTable, PwgNamedArray, response_xml
 
 
 _log = logging.getLogger(__name__)
 
 
-class PwgNamedArray(list):
-    def __init__(self, l, item_name, as_attrib=()):
-        self.item_name = item_name
-        self.as_attrib = as_attrib
-        list.__init__(self, l)
-
-    def fill_element_xml(self, el):
-        for it in self:
-            n = ET.SubElement(el, self.item_name)
-            if isinstance(it, dict):
-                _fill_element_dict(n, it, self.as_attrib)
-            else:
-                _fill_element(n, it)
-
-
-def _fill_element_dict(el, data, as_attr=()):
-    for k,v in data.iteritems():
-        if k in as_attr:
-            if not isinstance(v, basestring):
-                v = str(v)
-            el.set(k, v)
-        else:
-            n = ET.SubElement(el, k)
-            _fill_element(n, v)
-
-
-def _fill_element(el, data):
-    if isinstance(data, bool):
-        if data:
-            el.text = "1"
-        else:
-            el.text = "0"
-    elif isinstance(data, basestring):
-        el.text = data
-    elif isinstance(data, int):
-        el.text = str(data)
-    elif isinstance(data, dict):
-        _fill_element_dict(el, data)
-    elif isinstance(data, PwgNamedArray):
-        data.fill_element_xml(el)
-    else:
-        _log.warn("Can't convert to xml: %r", data)
-
-
-def response_xml(result):
-    r = ET.Element("rsp")
-    r.set("stat", "ok")
-    _fill_element(r, result)
-    return Response(ET.tostring(r, encoding="utf-8", xml_declaration=True),
-                    mimetype='text/xml')
-
-
-class CmdTable(object):
-    _cmd_table = {}
-
-    def __init__(self, cmd_name, only_post=False):
-        assert not cmd_name in self._cmd_table
-        self.cmd_name = cmd_name
-        self.only_post = only_post
-
-    def __call__(self, to_be_wrapped):
-        assert not self.cmd_name in self._cmd_table
-        self._cmd_table[self.cmd_name] = (to_be_wrapped, self.only_post)
-        return to_be_wrapped
-
-    @classmethod
-    def find_func(cls, request):
-        if request.method == "GET":
-            cmd_name = request.args.get("method")
-        else:
-            cmd_name = request.form.get("method")
-        entry = cls._cmd_table.get(cmd_name)
-        if not entry:
-            return entry
-        func, only_post = entry
-        if only_post and request.method != "POST":
-            _log.warn("Method %s only allowed for POST", cmd_name)
-            raise MethodNotAllowed()
-        return func
-        
-
 @CmdTable("pwg.session.login", True)
 def pwg_login(request):
     username = request.form.get("username")