Merge pull request #34 from ArtjomP/fix-uwp-devel

ArtjomP · web-flow · commit 9ed1dcda0a69 · 2022-01-28T21:15:22.000+03:00
update constructor
diff --git a/src/PCLExt.FileStorage.UWP/StorageFolderImplementation.cs b/src/PCLExt.FileStorage.UWP/StorageFolderImplementation.cs
@@ -10,6 +10,7 @@
 
 using PCLExt.FileStorage.Exceptions;
 using PCLExt.FileStorage.UWP.Extensions;
+using PCLExt.FileStorage.Extensions;
 
 namespace PCLExt.FileStorage.UWP
 {
@@ -25,8 +26,11 @@ public bool Exists
             {
                 try
                 {
-                    var storageFolder = StorageFolder.GetFolderFromPathAsync(
-                        _storageFolder.Path).AsTask().GetAwaiter().GetResult();
+                    var storageFolder = StorageFolder
+                        .GetFolderFromPathAsync(_storageFolder.Path)
+                        .AsTask()
+                        .GetAwaiter()
+                        .GetResult();
                 }
                 catch (System.IO.FileNotFoundException)
                 {
@@ -62,16 +66,21 @@ public StorageFolderImplementation(StorageFolder storageFolder)
         }
 
         public StorageFolderImplementation(string path)
-        {
+        {            
             _storageFolder = StorageFolder
                 .GetFolderFromPathAsync(path)
-                .GetResults();
+                .AsTask()
+                .GetAwaiter()
+                .GetResult();
         }
 
         private BasicProperties GetStorageFolderProperties()
         {
-            return _storageFolder.GetBasicPropertiesAsync().
-                AsTask().GetAwaiter().GetResult();
+            return _storageFolder
+                .GetBasicPropertiesAsync()
+                .AsTask()
+                .GetAwaiter()
+                .GetResult();
         }
 
         public ExistenceCheckResult CheckExists(string name)
diff --git a/src/PCLExt.FileStorage/Folders/FolderFromPath.cs b/src/PCLExt.FileStorage/Folders/FolderFromPath.cs
@@ -15,6 +15,7 @@ public FolderFromPath(params string[] paths) : base(GetFolderFromPath(System.IO.
         /// Creates a new <see cref="BaseFolder"/> corresponding to the specified path.
         /// </summary>
         /// <param name="path">The file path</param>
+        /// <param name="createIfNotExisting">Create folder automatically</param>
         public FolderFromPath(string path, bool createIfNotExisting = false) : base(GetFolderFromPath(path, createIfNotExisting)) { }
         private static IFolder GetFolderFromPath(string path, bool createIfNotExisting = false)
         {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`	`using PCLExt.FileStorage.Exceptions;`
`12`	`12`	`using PCLExt.FileStorage.UWP.Extensions;`
	`13`	`+using PCLExt.FileStorage.Extensions;`
`13`	`14`
`14`	`15`	`namespace PCLExt.FileStorage.UWP`
`15`	`16`	`{`
`@@ -25,8 +26,11 @@ public bool Exists`
`25`	`26`	`{`
`26`	`27`	`try`
`27`	`28`	`{`
`28`		`- var storageFolder = StorageFolder.GetFolderFromPathAsync(`
`29`		`- _storageFolder.Path).AsTask().GetAwaiter().GetResult();`
	`29`	`+ var storageFolder = StorageFolder`
	`30`	`+ .GetFolderFromPathAsync(_storageFolder.Path)`
	`31`	`+ .AsTask()`
	`32`	`+ .GetAwaiter()`
	`33`	`+ .GetResult();`
`30`	`34`	`}`
`31`	`35`	`catch (System.IO.FileNotFoundException)`
`32`	`36`	`{`
`@@ -62,16 +66,21 @@ public StorageFolderImplementation(StorageFolder storageFolder)`
`62`	`66`	`}`
`63`	`67`
`64`	`68`	`public StorageFolderImplementation(string path)`
`65`		`- {`
	`69`	`+ {`
`66`	`70`	`_storageFolder = StorageFolder`
`67`	`71`	`.GetFolderFromPathAsync(path)`
`68`		`- .GetResults();`
	`72`	`+ .AsTask()`
	`73`	`+ .GetAwaiter()`
	`74`	`+ .GetResult();`
`69`	`75`	`}`
`70`	`76`
`71`	`77`	`private BasicProperties GetStorageFolderProperties()`
`72`	`78`	`{`
`73`		`- return _storageFolder.GetBasicPropertiesAsync().`
`74`		`- AsTask().GetAwaiter().GetResult();`
	`79`	`+ return _storageFolder`
	`80`	`+ .GetBasicPropertiesAsync()`
	`81`	`+ .AsTask()`
	`82`	`+ .GetAwaiter()`
	`83`	`+ .GetResult();`
`75`	`84`	`}`
`76`	`85`
`77`	`86`	`public ExistenceCheckResult CheckExists(string name)`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public FolderFromPath(params string[] paths) : base(GetFolderFromPath(System.IO.`
`15`	`15`	`/// Creates a new <see cref="BaseFolder"/> corresponding to the specified path.`
`16`	`16`	`/// </summary>`
`17`	`17`	`/// <param name="path">The file path</param>`
	`18`	`+ /// <param name="createIfNotExisting">Create folder automatically</param>`
`18`	`19`	`public FolderFromPath(string path, bool createIfNotExisting = false) : base(GetFolderFromPath(path, createIfNotExisting)) { }`
`19`	`20`	`private static IFolder GetFolderFromPath(string path, bool createIfNotExisting = false)`
`20`	`21`	`{`