Merge branch 'master' of wiscigt.powertheword.com:andrej.studen/labkeyinterface

labkeyFileBrowser.py

@@ -1,6 +1,6 @@
 import urllib3
 import xml.etree.ElementTree as ET
-
+import shutil
 
 class labkeyFileBrowser:
 
@@ -47,7 +47,19 @@ class labkeyFileBrowser:
         return True,dirs
 
     def readFileToBuffer(self, url):
-        return self.net.get(url)
+        return self.net.get(url,binary=True)
+
+    def readFileToFile(self,url,path):
+        response=self.readFileToBuffer(url)
+        with open(path,'wb') as out_file:
+            shutil.copyfileobj(response,out_file)
+        response.release_conn()
+
+    def writeFileToFile(self,path,url):
+        with open(path,'rb') as f:
+            data=f.read()
+        self.net.put(url,data)
+
     
     def formatPathURL(self,project,path):
         url=self.GetRootUrl()+'/'+project+'/@files'

labkeyInterface.py

@@ -48,7 +48,7 @@ class labkeyInterface:
 
 
     
-    def get(self,url):
+    def get(self,url,binary=False):
 
         debug=False
         if debug:
@@ -56,7 +56,11 @@ class labkeyInterface:
             print("as {0}").format(user)
         headers=urllib3.util.make_headers(basic_auth=self.getBasicAuth())
         try:
-            return self.http.request('GET',url,headers=headers)
+            if not binary:
+                return self.http.request('GET',url,headers=headers)
+            else:
+                return self.http.request('GET',url,headers=headers,preload_content=False)
+        #f contains json as a return value
         #f contains json as a return value
         except urllib3.exceptions.HTTPError as e:
             print(e)