# HG changeset patch
# User Dennis Fink <dennis.fink@c3l.lu>
# Date 2015-10-17 13:50:00
# Node ID 85bbe14fa8b294a4bdc809b0e8cf57d01c0efb60
# Parent  3816c9e5893cdced7904a6272b35cc07a5d631e7

Remove xml export

diff --git a/ennstatus/api/views.py b/ennstatus/api/views.py
--- a/ennstatus/api/views.py
+++ b/ennstatus/api/views.py
@@ -123,14 +123,10 @@ def update():
     )
 
 
-@api_page.route('/export', defaults={'server_type': 'all',
-                                     'export_format': 'json'})
-@api_page.route('/export/<any("json", "xml"):export_format>',
-                defaults={'server_type': 'all'})
-@api_page.route(('/export/<any("json", "xml"):export_format>'
-                 '/<any("all", "exit", "bridge", "relay", "single")'
+@api_page.route('/export', defaults={'server_type': 'all'})
+@api_page.route(('/export/<any("all", "exit", "bridge", "relay", "single")'
                  ':server_type>'))
-def export(export_format, server_type):
+def export(server_type):
 
     current_app.logger.info('Handling export')
     if server_type == 'single':
@@ -138,17 +134,7 @@ def export(export_format, server_type):
         if server_name is not None:
             server = single_server(server_name)
             if server:
-                if export_format == 'json':
-                    current_app.logger.info('Returning server as json!')
-                    return (server.json(), 200,
-                            {'Content-Type': 'application/json'})
-                else:
-                    current_app.logger.info('Returning server as xml!')
-                    return (
-                        render_template(
-                            'api/export/xml/single_server.xml',
-                            server=server),
-                        200, {'Content-Type': 'text/xml'})
+                return server.json(), 200, {'Content-Type': 'application/json'}
             else:
                 current_app.logger.warning('Server not found!')
                 return ('Server not found!\n',
@@ -168,14 +154,10 @@ def export(export_format, server_type):
             ]
         else:
             current_app.logger.info('Getting all {}!'.format(server_type))
-            servers = list(all_servers_by_type(server_type.lower()))
+            servers = [
+                json.loads(
+                    server.json()
+                ) for server in all_servers_by_type(server_type.lower())
+            ]
 
-        if export_format == 'json':
-            current_app.logger.info('Returning as json!')
-            return (json.dumps(servers),
-                    200, {'Content-Type': 'application/json'})
-        else:
-            current_app.logger.info('Returning as xml!')
-            return (render_template('api/export/xml/network.xml',
-                                    servers=servers),
-                    200, {'Content-Type': 'text/xml'})
+        return json.dumps(servers), 200, {'Content-Type': 'application/json'}
diff --git a/ennstatus/templates/api/export/xml/network.xml b/ennstatus/templates/api/export/xml/network.xml
deleted file mode 100644
--- a/ennstatus/templates/api/export/xml/network.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<enn_network>
-  {% for server in servers %}
-    {%- include "api/export/xml/server.xml" %}
-  {% endfor %}
-</enn_network>
diff --git a/ennstatus/templates/api/export/xml/server.xml b/ennstatus/templates/api/export/xml/server.xml
deleted file mode 100644
--- a/ennstatus/templates/api/export/xml/server.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<server>
-    <type>{{ server.type }}</type>
-    <name>{{ server.name }}</name>
-    <status>{{ server.status }}</status>
-    <country>{{ server.country }}</country>
-    <last_updated>{{ server.last_updated }}</last_updated>
-    <fingerprint>{{ serverfingerprint }}</fingerprint>
-    {% if server.type == 'bridge' %}
-    <obfs>{{ server.obfs }}</obfs>
-    <fteproxy>{{ server.fteproxy }}</fteproxy>
-    <flashproxy>{{ server.flashproxy }}</flashproxy>
-    <meek>{{ server.meek }}</meek>
-    {% else %}
-    <ip>{{ server.ip }}</ip>
-      {% if 'ip6' in server %}
-        <ip6>{{ server.ip6</ip6>
-      {% endif %}
-    {% endif %}
-  </server>
diff --git a/ennstatus/templates/api/export/xml/single_server.xml b/ennstatus/templates/api/export/xml/single_server.xml
deleted file mode 100644
--- a/ennstatus/templates/api/export/xml/single_server.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-{% include "api/export/xml/server.xml" %}