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

piwigo: Add PwgError class.

Browse Source 
This allows to return piwigo xml errors.
Those can also be matched into html error codes.
This commit is contained in:
Elrond 2013-05-20 19:28:35 +02:00
parent d6c3375a78
commit 68910f6797
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mediagoblin/plugins/piwigo/tools.py
View File

@ -14,6 +14,7 @@
# You should have received a copy of the GNU Affero General Public License # 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/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from collections import namedtuple
import logging import logging
import six import six
@ -27,6 +28,9 @@ from mediagoblin.tools.response import Response
_log = logging.getLogger(__name__) _log = logging.getLogger(__name__)
PwgError = namedtuple("PwgError", ["code", "msg"])
class PwgNamedArray(list): class PwgNamedArray(list):
def __init__(self, l, item_name, as_attrib=()): def __init__(self, l, item_name, as_attrib=()):
self.item_name = item_name self.item_name = item_name
@ -74,9 +78,17 @@ def _fill_element(el, data):
def response_xml(result): def response_xml(result):
r = ET.Element("rsp") r = ET.Element("rsp")
r.set("stat", "ok") r.set("stat", "ok")
_fill_element(r, result) status = None
if isinstance(result, PwgError):
r.set("stat", "fail")
err = ET.SubElement(r, "err")
err.set("code", str(result.code))
err.set("msg", result.msg)
status = result.code
else:
_fill_element(r, result)
return Response(ET.tostring(r, encoding="utf-8", xml_declaration=True), return Response(ET.tostring(r, encoding="utf-8", xml_declaration=True),
mimetype='text/xml') mimetype='text/xml', status=status)
class CmdTable(object): class CmdTable(object):