Implemented GetFileBytes

cyberblast · Nov 29, 2017 · 2ba6f0c · 2ba6f0c
1 parent 2b83f93
commit 2ba6f0c
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/SharePoint.Client/Delegates.cs b/SharePoint.Client/Delegates.cs
@@ -7,4 +7,4 @@ public enum State { Offline, Connecting, Connected, Error, ConnectionFailed, Aut
     public delegate void StreamCall(Stream stream);
     public delegate void ItemMethod(ListItem item);
     public delegate S Transformer<T, S>(T initialValue);
-}
+}
diff --git a/SharePoint.Client/ISPClient.cs b/SharePoint.Client/ISPClient.cs
@@ -11,7 +11,7 @@ public interface ISPClient {
         CookieCollection Cookies { get; set; }
         bool Authenticate();
         void Execute(Call action);
-        void GetFileStream(string serverRelativeUrl, StreamCall handler, ClientContext ctx);
-        void GetFileStream(string serverRelativeUrl, StreamCall handler);
+        void GetFileStream(string serverRelativeUrl, StreamCall handler, ClientContext ctx = null);
+        byte[] GetFileBytes(string serverRelativeUrl, ClientContext ctx = null);
     }
 }
diff --git a/SharePoint.Client/QueryBuilder.cs b/SharePoint.Client/QueryBuilder.cs
@@ -1,20 +1,18 @@
 using Microsoft.SharePoint.Client;
 using System;
 
-namespace cyberblast.SharePoint.Client
-{
-    public static class QueryBuilder
-    {
+namespace cyberblast.SharePoint.Client {
+    public static class QueryBuilder {
         const int ROW_LIMIT = 300;
+
         /// <summary>
         /// Create a CAML query
         /// </summary>
         /// <param name="filter">filter expression. Will be wrapped into 'Where' tags.</param>
         /// <param name="rowlimit">amount of items to retrieve per internal call.</param>
         /// <param name="orderByFields">Sort order of items</param>
         /// <returns>CAML query string</returns>
-        public static QueryExpression Query(Expression filter, int rowlimit, params Order[] orderByFields)
-        {
+        public static QueryExpression Query(Expression filter, int rowlimit, params Order[] orderByFields) {
             return string.Format("<View><Query>{0}{1}</Query><RowLimit>{2}</RowLimit></View>", Where(filter), OrderBy(orderByFields), rowlimit);
         }
         /// <summary>

diff --git a/SharePoint.Client/SPClient.cs b/SharePoint.Client/SPClient.cs
@@ -123,19 +123,29 @@ public void Execute(Call action) {
             }
         }
 
-        public void GetFileStream(string serverRelativeUrl, StreamCall handler, ClientContext ctx)
-        {
-            using (FileInformation remoteFile = Microsoft.SharePoint.Client.File.OpenBinaryDirect(ctx, serverRelativeUrl)) { 
-                handler(remoteFile.Stream);
-            }
-        }
-        public void GetFileStream(string serverRelativeUrl, StreamCall handler)
-        {
-            Execute(ctx => {
-                GetFileStream(serverRelativeUrl, handler, ctx);
-            });
+        public void GetFileStream(string serverRelativeUrl, StreamCall handler, ClientContext ctx = null) {
+            void GetStream(ClientContext c){
+                using (FileInformation remoteFile = Microsoft.SharePoint.Client.File.OpenBinaryDirect(c, serverRelativeUrl)) {
+                    handler(remoteFile.Stream);
+                }
+            };
+            if (ctx == null) Execute(GetStream);
+            else GetStream(ctx);
         }
+        public byte[] GetFileBytes(string serverRelativeUrl, ClientContext ctx = null) {
+            byte[] bits = null;
 
+            void GetBytes(Stream stream) {
+                using (MemoryStream temp = new MemoryStream()) {
+                    stream.CopyTo(temp, 16384); // 16KB buffer
+                    bits = temp.ToArray();
+                }
+            }
+
+            GetFileStream(serverRelativeUrl, GetBytes, ctx);
+            return bits;
+        }
+
         private void ExecutingWebRequest(object sender, WebRequestEventArgs e) {
             if (!FormsBasedAuthAccepted)
                 e.WebRequestExecutor.WebRequest.Headers.Add("X-FORMS_BASED_AUTH_ACCEPTED", "f");