Change IBackend.List() to return IEnumerable instead of List

By changing to IEnumerable, it is possible to iterate only a portion of the list, which is useful when not all entries are needed (e.g., when testing a connection).
All existing backends have been updated, and any which were able to be changed to yield return results in a straightforward way now do.
Many backends had a try/catch in the List() method. Due to the fact that yield returns can't be placed within a try/catch block, these have been refactored to either scope the try/catch to the parts that (should) be the only places throwing exceptions, so that exceptions are still caught and handled.
Note that lazy evaluation may cause some changes in behavior - exceptions that were previously thrown at the point of invokation of List() may now be thrown while it is being enumerated.
I believe this will not be problematic though, as the only well-known exception seems to be FolderMissingException, which should be thrown by Test(), but TestList() attempts to enumerate the list to force this exception.
Any places that require the legacy behavior can get it by simply converting the lazy enumerable to a List()

1 files changed, 34 insertions, 32 deletions

diff --git a/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs b/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs
index dcdeb64db..663bd274b 100644
--- a/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs
+++ b/Duplicati/Library/Backend/GoogleServices/GoogleCloudStorage.cs
@@ -98,8 +98,7 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
             m_oauth = new OAuthHelper(authid, this.ProtocolKey);

             m_oauth.AutoAuthHeader = true;

         }

-

-

+        

 

         private class ListBucketResponse

         {

@@ -130,39 +129,13 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
             public string location { get; set; }

             public string storageClass { get; set; }

         }

+

         #region IBackend implementation

-        public List<IFileEntry> List()

+        public IEnumerable<IFileEntry> List()

         {

             try

             {

-                var res = new List<IFileEntry>();

-                string token = null;

-                do

-                {

-                    var url = string.Format("{0}/b/{1}/o?prefix={2}", API_URL, m_bucket, Library.Utility.Uri.UrlEncode(m_prefix));

-                    if (!string.IsNullOrEmpty(token))

-                        url += string.Format("&pageToken={0}", token);

-                    var resp = m_oauth.ReadJSONResponse<ListBucketResponse>(url);

-

-                    if (resp.items != null)

-                        foreach(var f in resp.items)

-                        {

-                            var name = f.name;

-                            if (name.StartsWith(m_prefix, StringComparison.OrdinalIgnoreCase))

-                                name = name.Substring(m_prefix.Length);

-                            if (f.size == null)

-                                res.Add(new FileEntry(name));

-                            else if (f.updated == null)

-                                res.Add(new FileEntry(name, f.size.Value));

-                            else

-                                res.Add(new FileEntry(name, f.size.Value, f.updated.Value, f.updated.Value));

-                        }

-

-                    token = resp.nextPageToken;

-

-                } while(!string.IsNullOrEmpty(token));

-

-                return res;

+                return this.ListWithoutExceptionCatch();

             }

             catch (WebException wex)

             {

@@ -173,6 +146,35 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
             }

         }

 

+        private IEnumerable<IFileEntry> ListWithoutExceptionCatch()

+        {

+            string token = null;

+            do

+            {

+                var url = string.Format("{0}/b/{1}/o?prefix={2}", API_URL, m_bucket, Library.Utility.Uri.UrlEncode(m_prefix));

+                if (!string.IsNullOrEmpty(token))

+                    url += string.Format("&pageToken={0}", token);

+                var resp = m_oauth.ReadJSONResponse<ListBucketResponse>(url);

+

+                if (resp.items != null)

+                    foreach (var f in resp.items)

+                    {

+                        var name = f.name;

+                        if (name.StartsWith(m_prefix, StringComparison.OrdinalIgnoreCase))

+                            name = name.Substring(m_prefix.Length);

+                        if (f.size == null)

+                            yield return new FileEntry(name);

+                        else if (f.updated == null)

+                            yield return new FileEntry(name, f.size.Value);

+                        else

+                            yield return new FileEntry(name, f.size.Value, f.updated.Value, f.updated.Value);

+                    }

+

+                token = resp.nextPageToken;

+

+            } while (!string.IsNullOrEmpty(token));

+        }

+

         public void Put(string remotename, string filename)

         {

             using (System.IO.FileStream fs = System.IO.File.OpenRead(filename))

@@ -195,7 +197,7 @@ namespace Duplicati.Library.Backend.GoogleCloudStorage
 

         public void Test()

         {

-            List();

+            this.TestList();

         }

 

         public void CreateFolder()