lifegpc/GARbro-crskycode
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2026-07-08 01:30:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

(ConvertWorker): abort processing on NotImplementedException.

Browse Source
This commit is contained in:
morkt
2015-06-17 17:36:31 +04:00
parent e855f3d888
commit ac5a7cd173
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
GarConvert.cs
View File

@@ -47,9 +47,9 @@ namespace GARbro.GUI
{ {
if (ViewModel.IsArchive) if (ViewModel.IsArchive)
return; return;
var source = CurrentDirectory.SelectedItems.Cast<EntryViewModel>() var source = from entry in CurrentDirectory.SelectedItems.Cast<EntryViewModel>()
.Where (f => f.Type == "image" || f.Type == "audio") where entry.Type == "image" || entry.Type == "audio"
.Select (f => f.Source); select entry.Source;
if (!source.Any()) if (!source.Any())
{ {
PopupError (guiStrings.MsgNoMediaFiles, guiStrings.TextMediaConvertError); PopupError (guiStrings.MsgNoMediaFiles, guiStrings.TextMediaConvertError);
@@ -136,6 +136,12 @@ namespace GARbro.GUI
else if ("audio" == entry.Type) else if ("audio" == entry.Type)
ConvertAudio (filename); ConvertAudio (filename);
} }
catch (NotImplementedException X)
{
// target format creation not implemented
m_pending_error = X;
break;
}
catch (Exception X) catch (Exception X)
{ {
if (!IgnoreErrors) if (!IgnoreErrors)
@@ -186,13 +192,11 @@ namespace GARbro.GUI
void ConvertImage (string filename) void ConvertImage (string filename)
{ {
string target_ext = m_image_format.Extensions.First();
string target_name = Path.ChangeExtension (filename, target_ext);
if (filename == target_name)
return;
string source_ext = Path.GetExtension (filename).TrimStart ('.').ToLowerInvariant(); string source_ext = Path.GetExtension (filename).TrimStart ('.').ToLowerInvariant();
if (m_image_format.Extensions.Any (ext => ext == source_ext)) if (m_image_format.Extensions.Any (ext => ext == source_ext))
return; return;
string target_ext = m_image_format.Extensions.First();
string target_name = Path.ChangeExtension (filename, target_ext);
using (var file = File.OpenRead (filename)) using (var file = File.OpenRead (filename))
{ {
var image = ImageFormat.Read (file); var image = ImageFormat.Read (file);