Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 19:22:53 +01:00
Code Issues Projects Releases Wiki Activity

Allow import plain text even if file is in use - thx darnn :)

Browse Source 
Fix #2642
This commit is contained in:
Nikolaj Olsson 2017-11-23 22:16:12 +01:00
parent 5b97f42f51
commit ca6d9d54fd
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libse/FileUtil.cs
View File

@ -39,6 +39,16 @@ namespace Nikse.SubtitleEdit.Core
}
}
public static string[] ReadAllLinesShared(string path, Encoding encoding)
{
return encoding.GetString(ReadAllBytesShared(path)).SplitToLines();
}
public static string ReadAllTextShared(string path, Encoding encoding)
{
return encoding.GetString(ReadAllBytesShared(path));
}
public static bool IsZip(string fileName)
{
using (var fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))

4
src/Forms/ImportText.cs
View File

@ -150,7 +150,7 @@ namespace Nikse.SubtitleEdit.Forms
ext = extension.ToLowerInvariant();
var fd = new FinalDraftTemplate2();
var list = new List<string>(File.ReadAllLines(fileName, LanguageAutoDetect.GetEncodingFromFile(fileName)));
var list = new List<string>(FileUtil.ReadAllLinesShared(fileName, LanguageAutoDetect.GetEncodingFromFile(fileName)));
bool isFinalDraft = fd.IsMine(list, fileName);
if (ext == ".astx")
@ -694,7 +694,7 @@ namespace Nikse.SubtitleEdit.Forms
try
{
Encoding encoding = LanguageAutoDetect.GetEncodingFromFile(fileName);
var text = File.ReadAllText(fileName, encoding);
var text = FileUtil.ReadAllTextShared(fileName, encoding);
if (fileName.EndsWith(".htm", StringComparison.OrdinalIgnoreCase) || fileName.EndsWith(".htm", StringComparison.OrdinalIgnoreCase))
text = HtmlToPlainText(text);
return text;