Skip to content

Update FileBrowser.cs #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Update FileBrowser.cs #54

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 44 additions & 12 deletions Plugins/SimpleFileBrowser/Scripts/FileBrowser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ public class Filter
{
public readonly string name;
public readonly HashSet<string> extensions;
public readonly ItemPassesFilter itemPassesFilter;
public readonly string defaultExtension;

public delegate bool ItemPassesFilter( FileSystemEntry item );

internal Filter( string name )
{
this.name = name;
Expand Down Expand Up @@ -72,6 +75,41 @@ public Filter( string name, params string[] extensions )
defaultExtension = extensions[0];
}

public Filter( string name, ItemPassesFilter filterDelegate, string defaultExtension = null)
{
this.name = name;
this.itemPassesFilter = filterDelegate;
this.defaultExtension = defaultExtension;
}

public bool PassesFilter( FileSystemEntry item ) {

if (extensions != null && extensions.Contains( item.Extension.ToLowerInvariant() ) == false ) {
return false;
}

if (itemPassesFilter != null && itemPassesFilter(item) == false ) {
return false;
}

return true;
}
public string AdjustFilename( string filename ) {
if (defaultExtension != null) {

string ext = Path.GetExtension( filename );
bool extValid = string.IsNullOrEmpty( ext ) == false;
if (extValid && extensions != null)
extValid = extensions.Contains( ext.ToLowerInvariant() );

if (extValid == false) {
filename = Path.ChangeExtension( filename, defaultExtension );
}
}

return filename;
}

public override string ToString()
{
string result = string.Empty;
Expand Down Expand Up @@ -1274,13 +1312,8 @@ public void OnSubmitButtonClicked()
{
// This is a nonexisting file
string filename = filenameInput.Substring( startIndex, filenameLength );
if( m_pickerMode != PickMode.Folders && filters[filtersDropdown.value].defaultExtension != null )
{
// In file selection mode, make sure that nonexisting files' extensions match one of the required extensions
string fileExtension = Path.GetExtension( filename );
if( string.IsNullOrEmpty( fileExtension ) || !filters[filtersDropdown.value].extensions.Contains( fileExtension.ToLowerInvariant() ) )
filename = Path.ChangeExtension( filename, filters[filtersDropdown.value].defaultExtension );
}
if( m_pickerMode != PickMode.Folders)
filename = filters[filtersDropdown.value].AdjustFilename(filename);

#if !UNITY_EDITOR && UNITY_ANDROID
if( FileBrowserHelpers.ShouldUseSAF )
Expand Down Expand Up @@ -1731,8 +1764,7 @@ public void RefreshFiles( bool pathChanged )
if( excludedExtensionsSet.Contains( extension ) )
continue;

HashSet<string> extensions = filters[filtersDropdown.value].extensions;
if( extensions != null && !extensions.Contains( extension ) )
if (filters[filtersDropdown.value].PassesFilter(item) == false)
continue;
}
else
Expand Down Expand Up @@ -2490,7 +2522,7 @@ public static void SetFilters( bool showAllFilesFilter, IEnumerable<Filter> filt
{
foreach( Filter filter in filters )
{
if( filter != null && filter.defaultExtension.Length > 0 )
if( filter != null )
Instance.filters.Add( filter );
}
}
Expand All @@ -2506,7 +2538,7 @@ public static void SetFilters( bool showAllFilesFilter, params Filter[] filters
{
for( int i = 0; i < filters.Length; i++ )
{
if( filters[i] != null && filters[i].defaultExtension.Length > 0 )
if( filters[i] != null )
Instance.filters.Add( filters[i] );
}
}
Expand Down Expand Up @@ -2622,4 +2654,4 @@ public static Permission RequestPermission()
}
#endregion
}
}
}