aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Continue trying filters when one raises an exception.

Browse Source
This commit is contained in:
Natalia Portillo
2020-10-23 04:07:33 +01:00
parent f4eb9f5b4a
commit 3feb756d46
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Filters.cs
View File

@@ -60,7 +60,7 @@ namespace Aaru.CommonTypes
try
{
var filter = (IFilter)type.GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
{});
{});
if(filter != null &&
!Filters.ContainsKey(filter.Name.ToLower()))
@@ -77,18 +77,19 @@ namespace Aaru.CommonTypes
/// <returns>The filter that allows reading the specified path</returns>
public IFilter GetFilter(string path)
{
try
{
IFilter noFilter = null;
IFilter noFilter = null;
foreach(IFilter filter in Filters.Values)
foreach(IFilter filter in Filters.Values)
{
try
{
if(filter.Id != new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
{
if(!filter.Identify(path))
continue;
var foundFilter = (IFilter)filter.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[]
{});
{});
foundFilter?.Open(path);
@@ -97,18 +98,19 @@ namespace Aaru.CommonTypes
}
else
noFilter = filter;
}
catch(IOException)
{
// Ignore and continue
}
}
if(!noFilter?.Identify(path) == true)
return noFilter;
noFilter?.Open(path);
if(!noFilter?.Identify(path) == true)
return noFilter;
}
catch(IOException)
{
return null;
}
noFilter?.Open(path);
return noFilter;
}
}
}