Merge Pakfire Hub into the main webapp

[pbs.git] / src / buildservice / uploads.py

diff --git a/src/buildservice/uploads.py b/src/buildservice/uploads.py
index 594e2c8ac9f219c2664f835dba8e1cd13272039f..436de66f2949715826be8ae29ac9fd3bf591f2e3 100644 (file)
--- a/src/buildservice/uploads.py
+++ b/src/buildservice/uploads.py
@@ -8,6 +8,7 @@ import os
 import shutil
 
 from . import base
+from . import builders
 from . import users
 from .constants import *
 from .decorators import *
@@ -49,7 +50,16 @@ class Uploads(base.Object):
                        """, uuid,
                )
 
-       def create(self, filename, size, builder=None, user=None):
+       def create(self, filename, size, uploader=None):
+               builder = None
+               user = None
+
+               # Check uploader type
+               if isinstance(uploader, builders.Builder):
+                       builder = uploader
+               elif isinstance(uploader, users.User):
+                       user = uploader
+
                # Check quota for users
                if user:
                        # This will raise an exception if the quota has been exceeded