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

🐛Fix crashing if filter sends an IOException.

Browse Source
This commit is contained in:
Natalia Portillo
2018-01-28 17:30:22 +00:00
parent 7ecdd1ae4e
commit 8e5d62f048
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
DiscImageChef.Filters/Filters.cs
View File

@@ -32,6 +32,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
using DiscImageChef.Console; using DiscImageChef.Console;
@@ -48,7 +49,7 @@ namespace DiscImageChef.Filters
public FiltersList() public FiltersList()
{ {
Assembly assembly = Assembly.GetAssembly(typeof(IFilter)); Assembly assembly = Assembly.GetAssembly(typeof(IFilter));
Filters = new SortedDictionary<string, IFilter>(); Filters = new SortedDictionary<string, IFilter>();
foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilter)))) foreach(Type type in assembly.GetTypes().Where(t => t.GetInterfaces().Contains(typeof(IFilter))))
try try
@@ -67,27 +68,31 @@ namespace DiscImageChef.Filters
/// <returns>The filter that allows reading the specified path</returns> /// <returns>The filter that allows reading the specified path</returns>
public IFilter GetFilter(string path) public IFilter GetFilter(string path)
{ {
IFilter noFilter = null; try
{
IFilter noFilter = null;
foreach(IFilter filter in Filters.Values)
if(filter.Id != new Guid("12345678-AAAA-BBBB-CCCC-123456789000"))
{
if(!filter.Identify(path)) continue;
foreach(IFilter filter in Filters.Values) IFilter foundFilter =
if(filter.Id != new Guid("12345678-AAAA-BBBB-CCCC-123456789000")) (IFilter)filter.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { });
{
if(!filter.Identify(path)) continue;
IFilter foundFilter = foundFilter?.Open(path);
(IFilter)filter.GetType().GetConstructor(Type.EmptyTypes)?.Invoke(new object[] { });
foundFilter?.Open(path); if(foundFilter?.IsOpened() == true) return foundFilter;
}
else
noFilter = filter;
if(foundFilter?.IsOpened() == true) return foundFilter; if(!noFilter?.Identify(path) == true) return noFilter;
}
else noFilter = filter;
if(!noFilter?.Identify(path) == true) return noFilter; noFilter?.Open(path);
noFilter?.Open(path); return noFilter;
}
return noFilter; catch(IOException) { return null; }
} }
/// <summary> /// <summary>