From 3c6887b839507e8c4029c1028d55846cbbfd845e Mon Sep 17 00:00:00 2001
From: RaNaN <Mast3rRaNaN@hotmail.de>
Date: Wed, 11 Sep 2013 12:27:33 +0200
Subject: container upload and url parser for linkgrabber

---
 pyload/web/api_app.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pyload/web/api_app.py')

diff --git a/pyload/web/api_app.py b/pyload/web/api_app.py
index b13e3bed9..66cdd58fd 100644
--- a/pyload/web/api_app.py
+++ b/pyload/web/api_app.py
@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 
 from urllib import unquote
-from itertools import chain
 from traceback import format_exc, print_exc
 
 from bottle import route, request, response, HTTPError, parse_auth
@@ -60,8 +59,14 @@ def call_api(func, args=""):
     if request.json:
         kwargs = request.json
 
+    # file upload, reads whole file into memory
+    for name, f in request.files.iteritems():
+        print f.length
+        kwargs["filename"] = f.filename
+        kwargs[name] = f.value
+
     # convert arguments from json to obj separately
-    for x, y in chain(request.GET.iteritems(), request.POST.iteritems()):
+    for x, y in request.params.iteritems():
         if not x or not y or x == "session": continue
         kwargs[x] = loads(unquote(y))
 
-- 
cgit v1.2.3