Skip to content

Commit

Permalink
Fixed GetFiles
Browse files Browse the repository at this point in the history
  • Loading branch information
Aragas committed Apr 6, 2017
1 parent 0974814 commit 8b8741e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions common/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("1.1.2.0")]
[assembly: AssemblyFileVersion("1.1.2.0")]
[assembly: AssemblyVersion("1.1.3.0")]
[assembly: AssemblyFileVersion("1.1.3.0")]
2 changes: 1 addition & 1 deletion common/PCLExt.FileStorage.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>PCLExt.FileStorage</id>
<version>1.1.2.0</version>
<version>1.1.3.0</version>
<title>PCL Extension - File Storage API</title>
<authors>Daniel Plaisted,Aragas</authors>
<owners>Aragas</owners>
Expand Down
4 changes: 2 additions & 2 deletions src/PCLExt.FileStorage.Abstractions/IFolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public interface IFolder
/// <param name="searchPattern"></param>
/// <param name="searchOption"></param>
/// <returns>A list of the files in the folder</returns>
IList<IFile> GetFiles(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly);
IList<IFile> GetFiles(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly);

/// <summary>
/// Gets a list of the files in this folder
Expand All @@ -95,7 +95,7 @@ public interface IFolder
/// <param name="searchOption"></param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>A list of the files in the folder</returns>
Task<IList<IFile>> GetFilesAsync(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken));
Task<IList<IFile>> GetFilesAsync(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken));

/// <summary>
/// Creates a subfolder in this folder
Expand Down
4 changes: 2 additions & 2 deletions src/PCLExt.FileStorage.Desktop/FileSystemFolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,13 @@ public IFile GetFile(string name)
}

/// <inheritdoc />
public IList<IFile> GetFiles(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly)
public IList<IFile> GetFiles(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly)
{
EnsureExists();
return Directory.GetFiles(Path, searchPattern, (SearchOption) searchOption).Select(f => new FileSystemFile(f)).ToList<IFile>().AsReadOnly();
}
/// <inheritdoc />
public async Task<IList<IFile>> GetFilesAsync(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken))
public async Task<IList<IFile>> GetFilesAsync(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken))
{
await AwaitExtensions.SwitchOffMainThreadAsync(cancellationToken);

Expand Down
4 changes: 2 additions & 2 deletions src/PCLExt.FileStorage/BaseFolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ protected BaseFolder(string path) : this(FileSystem.GetFolderFromPath(path)) { }
public Task<IFile> GetFileAsync(string name, CancellationToken cancellationToken = default(CancellationToken)) => _folder.GetFileAsync(name, cancellationToken);

/// <inheritdoc />
public IList<IFile> GetFiles(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly) => _folder.GetFiles(searchPattern, searchOption);
public IList<IFile> GetFiles(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly) => _folder.GetFiles(searchPattern, searchOption);
/// <inheritdoc />
public Task<IList<IFile>> GetFilesAsync(string searchPattern = "", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken)) => _folder.GetFilesAsync(searchPattern, searchOption, cancellationToken);
public Task<IList<IFile>> GetFilesAsync(string searchPattern = "*", FolderSearchOption searchOption = FolderSearchOption.TopFolderOnly, CancellationToken cancellationToken = default(CancellationToken)) => _folder.GetFilesAsync(searchPattern, searchOption, cancellationToken);

/// <inheritdoc />
public IFile CreateFile(string desiredName, CreationCollisionOption option) => _folder.CreateFile(desiredName, option);
Expand Down

0 comments on commit 8b8741e

Please sign in to comment.