Merge pull request #34 from yar229/develop

(more correct) folder listing performance improved
yar229 · Dec 6, 2016 · ec3c4d0 · ec3c4d0
2 parents 3890e31 + 9faabf7
commit ec3c4d0
Showing 1 changed file with 34 additions and 33 deletions.
diff --git a/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs b/WebDavMailRuCloudStore/Mailru/StoreBase/MailruStoreCollection.cs
@@ -35,16 +35,15 @@ public MailruStoreCollection(ILockingManager lockingManager, Folder directoryInf
 
             new DavQuotaAvailableBytes<MailruStoreCollection>
             {
-                Getter = (context, collection) =>
-                    collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Free : long.MaxValue
+                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Free : long.MaxValue,
+                IsExpensive = true  //folder listing performance
             },
 
-            //folder listing performance 
-            //new DavQuotaUsedBytes<MailruStoreCollection>
-            //{
-            //    Getter = (context, collection) =>
-            //        collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Used : long.MaxValue
-            //},
+            new DavQuotaUsedBytes<MailruStoreCollection>
+            {
+                Getter = (context, collection) => collection.FullPath == "/" ? Cloud.Instance.GetQuota().Result.Used : long.MaxValue,
+                IsExpensive = true  //folder listing performance
+            },
 
             // RFC-2518 properties
             new DavCreationDate<MailruStoreCollection>
@@ -79,16 +78,17 @@ public MailruStoreCollection(ILockingManager lockingManager, Folder directoryInf
             new DavLockDiscoveryDefault<MailruStoreCollection>(),
             new DavSupportedLockDefault<MailruStoreCollection>(),
 
-            // Hopmann/Lippert collection properties
-            //new DavExtCollectionChildCount<MailruStoreCollection>
-            //{
-            //    Getter = (context, collection) =>
-            //    {
-            //        var data = Cloud.Instance.GetItems(collection.DirectoryInfo).Result;
-            //        int cnt = data.NumberOfItems;
-            //        return cnt;
-            //    }
-            //},
+            //Hopmann/Lippert collection properties
+            new DavExtCollectionChildCount<MailruStoreCollection>
+            {
+                Getter = (context, collection) =>
+                {
+                    var data = Cloud.Instance.GetItems(collection.DirectoryInfo).Result;
+                    int cnt = data.NumberOfItems;
+                    return cnt;
+                },
+                IsExpensive = true  //folder listing performance
+            },
             new DavExtCollectionIsFolder<MailruStoreCollection>
             {
                 Getter = (context, collection) => true
@@ -102,33 +102,34 @@ public MailruStoreCollection(ILockingManager lockingManager, Folder directoryInf
                 Getter = (context, collection) => false
             },
 
-            //folder listing performance 
-            //new DavExtCollectionHasSubs<MailruStoreCollection>
-            //{
-            //    Getter = (context, collection) => collection.Folders.Any()
-            //},
+            new DavExtCollectionHasSubs<MailruStoreCollection>
+            {
+                Getter = (context, collection) => collection.Folders.Any(),
+                IsExpensive = true  //folder listing performance
+            },
 
             new DavExtCollectionNoSubs<MailruStoreCollection>
             {
                 Getter = (context, collection) => false //TODO: WTF?
             },
 
-            //folder listing performance 
-            //new DavExtCollectionObjectCount<MailruStoreCollection>
-            //{
-            //    Getter = (context, collection) => collection.Files.Count()
-            //},
+            new DavExtCollectionObjectCount<MailruStoreCollection>
+            {
+                Getter = (context, collection) => collection.Files.Count(),
+                IsExpensive = true  //folder listing performance
+            },
 
             new DavExtCollectionReserved<MailruStoreCollection>
             {
                 Getter = (context, collection) => !collection.IsWritable
             },
 
-            //folder listing performance 
-            //new DavExtCollectionVisibleCount<MailruStoreCollection>
-            //{
-            //    Getter = (context, collection) => collection.Items.Count
-            //},
+            //folder listing performance
+            new DavExtCollectionVisibleCount<MailruStoreCollection>
+            {
+                Getter = (context, collection) => collection.Items.Count,
+                IsExpensive = true  //folder listing performance
+            },
 
             // Win32 extensions
             new Win32CreationTime<MailruStoreCollection>