update code style and make file-loading async

This commit is contained in:
Paddy Xu
2018-02-25 00:14:29 +02:00
parent eb6e1c9d2e
commit bec5189a1c
5 changed files with 160 additions and 144 deletions

View File

@@ -15,7 +15,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -35,24 +35,24 @@ namespace QuickLook.Plugin.TextViewer
public void Init()
{
HighlightingManager hlm = HighlightingManager.Instance;
var hlm = HighlightingManager.Instance;
string assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
if (string.IsNullOrEmpty(assemblyPath)) return;
string syntaxPath = Path.Combine(assemblyPath, "Syntax");
var syntaxPath = Path.Combine(assemblyPath, "Syntax");
if (!Directory.Exists(syntaxPath)) return;
foreach (string file in Directory.EnumerateFiles(syntaxPath, "*.xshd"))
foreach (var file in Directory.EnumerateFiles(syntaxPath, "*.xshd"))
{
string lang = Path.GetFileNameWithoutExtension(file);
var ext = Path.GetFileNameWithoutExtension(file);
using (Stream s = File.OpenRead(Path.GetFullPath(file)))
using (XmlTextReader reader = new XmlTextReader(s))
using (var reader = new XmlTextReader(s))
{
XshdSyntaxDefinition xshd = HighlightingLoader.LoadXshd(reader);
IHighlightingDefinition highlightingDefinition = HighlightingLoader.Load(xshd, hlm);
var xshd = HighlightingLoader.LoadXshd(reader);
var highlightingDefinition = HighlightingLoader.Load(xshd, hlm);
if (xshd.Extensions.Count > 0)
hlm.RegisterHighlighting(lang, xshd.Extensions.ToArray(), highlightingDefinition);
hlm.RegisterHighlighting(ext, xshd.Extensions.ToArray(), highlightingDefinition);
}
}
}
@@ -62,23 +62,21 @@ namespace QuickLook.Plugin.TextViewer
if (Directory.Exists(path))
return false;
const long maxSize = 20 * 1024 * 1024;
if (path.ToLower().EndsWith(".txt"))
return new FileInfo(path).Length <= maxSize;
return true;
// if there is a matched highlighting scheme (by file extension), treat it as a plain text file
if (HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(path)) != null)
return new FileInfo(path).Length <= maxSize;
return true;
// otherwise, read the first 512KB, check if we can get something.
using (var s = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
// otherwise, read the first 16KB, check if we can get something.
using (var s = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
const int bufferLength = 512 * 1024;
const int bufferLength = 16 * 1024;
var buffer = new byte[bufferLength];
var size = s.Read(buffer, 0, bufferLength);
return IsText(buffer, size) && new FileInfo(path).Length <= maxSize;
return IsText(buffer, size);
}
}
@@ -93,16 +91,15 @@ namespace QuickLook.Plugin.TextViewer
context.ViewerContent = _tvp;
context.Title = $"{Path.GetFileName(path)}";
context.IsBusy = false;
}
public void Cleanup()
{
_tvp.viewer = null;
_tvp?.Dispose();
_tvp = null;
}
private bool IsText(byte[] buffer, int size)
private static bool IsText(IReadOnlyList<byte> buffer, int size)
{
for (var i = 1; i < size; i++)
if (buffer[i - 1] == 0 && buffer[i] == 0)

View File

@@ -77,9 +77,7 @@
</Compile>
<Compile Include="Plugin.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="TextViewerPanel.xaml.cs">
<DependentUpon>TextViewerPanel.xaml</DependentUpon>
</Compile>
<Compile Include="TextViewerPanel.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
@@ -88,12 +86,6 @@
<Private>False</Private>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Page Include="TextViewerPanel.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>

View File

@@ -0,0 +1,140 @@
// Copyright © 2017 Paddy Xu
//
// This file is part of QuickLook program.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.IO;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Threading;
using ICSharpCode.AvalonEdit;
using ICSharpCode.AvalonEdit.Document;
using ICSharpCode.AvalonEdit.Highlighting;
using QuickLook.Common.Helpers;
using QuickLook.Common.Plugin;
using UtfUnknown;
namespace QuickLook.Plugin.TextViewer
{
public class TextViewerPanel : TextEditor, IDisposable
{
private readonly ContextObject _context;
private bool _disposed;
public TextViewerPanel(string path, ContextObject context)
{
_context = context;
Background = Brushes.Transparent;
FontSize = 14;
ShowLineNumbers = true;
WordWrap = true;
IsReadOnly = true;
IsManipulationEnabled = true;
ManipulationInertiaStarting += Viewer_ManipulationInertiaStarting;
ManipulationStarting += Viewer_ManipulationStarting;
ManipulationDelta += Viewer_ManipulationDelta;
PreviewMouseWheel += Viewer_MouseWheel;
FontFamily = new FontFamily(TranslationHelper.Get("Editor_FontFamily"));
LoadFileAsync(path);
}
public void Dispose()
{
_disposed = true;
}
private void Viewer_ManipulationInertiaStarting(object sender, ManipulationInertiaStartingEventArgs e)
{
e.TranslationBehavior = new InertiaTranslationBehavior
{
InitialVelocity = e.InitialVelocities.LinearVelocity,
DesiredDeceleration = 10.0 * 96.0 / (1000.0 * 1000.0)
};
}
private void Viewer_MouseWheel(object sender, MouseWheelEventArgs e)
{
e.Handled = true;
ScrollToVerticalOffset(VerticalOffset - e.Delta);
}
private void Viewer_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
{
e.Handled = true;
var delta = e.DeltaManipulation;
ScrollToVerticalOffset(VerticalOffset - delta.Translation.Y);
}
private void Viewer_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
{
e.Mode = ManipulationModes.Translate;
}
private void LoadFileAsync(string path)
{
Task.Run(() =>
{
const int maxLength = 50 * 1024 * 1024;
var buffer = new MemoryStream();
using (var s = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
while (s.Position < s.Length && buffer.Length < maxLength)
{
if (_disposed)
break;
var lb = new byte[8192];
var count = s.Read(lb, 0, lb.Length);
buffer.Write(lb, 0, count);
}
}
if (_disposed)
return;
_context.Title += " (0 ~ 50MB)";
var encoding = CharsetDetector.DetectFromBytes(buffer.GetBuffer()).Detected?.Encoding ??
Encoding.Default;
var doc = new TextDocument(encoding.GetString(buffer.GetBuffer()));
doc.SetOwnerThread(Dispatcher.Thread);
if (_disposed)
return;
Dispatcher.BeginInvoke(new Action(() =>
{
Encoding = encoding;
SyntaxHighlighting = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(path));
Document = doc;
_context.IsBusy = false;
}), DispatcherPriority.Render);
});
}
}
}

View File

@@ -1,15 +0,0 @@
<UserControl x:Class="QuickLook.Plugin.TextViewer.TextViewerPanel"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:avalonEdit="http://icsharpcode.net/sharpdevelop/avalonedit"
xmlns:local="clr-namespace:QuickLook.Plugin.TextViewer"
mc:Ignorable="d"
d:DesignHeight="317.974"
d:DesignWidth="448.79">
<Grid>
<avalonEdit:TextEditor x:Name="viewer" Background="Transparent" FontSize="14" ShowLineNumbers="True"
WordWrap="True" IsReadOnly="True" IsManipulationEnabled="True" />
</Grid>
</UserControl>

View File

@@ -1,98 +0,0 @@
// Copyright © 2017 Paddy Xu
//
// This file is part of QuickLook program.
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System.IO;
using System.Text;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Media;
using ICSharpCode.AvalonEdit.Highlighting;
using QuickLook.Common.Helpers;
using QuickLook.Common.Plugin;
using UtfUnknown;
namespace QuickLook.Plugin.TextViewer
{
/// <summary>
/// Interaction logic for TextViewerPanel.xaml
/// </summary>
public partial class TextViewerPanel : UserControl
{
public TextViewerPanel(string path, ContextObject context)
{
InitializeComponent();
viewer.ManipulationInertiaStarting += Viewer_ManipulationInertiaStarting;
viewer.ManipulationStarting += Viewer_ManipulationStarting;
viewer.ManipulationDelta += Viewer_ManipulationDelta;
viewer.PreviewMouseWheel += Viewer_MouseWheel;
viewer.FontFamily = new FontFamily(TranslationHelper.Get("Editor_FontFamily"));
LoadFile(path);
}
private void Viewer_ManipulationInertiaStarting(object sender, ManipulationInertiaStartingEventArgs e)
{
e.TranslationBehavior = new InertiaTranslationBehavior
{
InitialVelocity = e.InitialVelocities.LinearVelocity,
DesiredDeceleration = 10.0 * 96.0 / (1000.0 * 1000.0)
};
}
private void Viewer_MouseWheel(object sender, MouseWheelEventArgs e)
{
e.Handled = true;
viewer.ScrollToVerticalOffset(viewer.VerticalOffset - e.Delta);
}
private void Viewer_ManipulationDelta(object sender, ManipulationDeltaEventArgs e)
{
e.Handled = true;
var delta = e.DeltaManipulation;
viewer.ScrollToVerticalOffset(viewer.VerticalOffset - delta.Translation.Y);
}
private void Viewer_ManipulationStarting(object sender, ManipulationStartingEventArgs e)
{
e.ManipulationContainer = this;
e.Mode = ManipulationModes.Translate;
}
private void LoadFile(string path)
{
using (var s = new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
{
const int bufferLength = 1 * 1024 * 1024;
var buffer = new byte[bufferLength];
s.Read(buffer, 0, bufferLength);
viewer.Encoding = CharsetDetector.DetectFromBytes(buffer).Detected?.Encoding ?? Encoding.Default;
s.Position = 0;
viewer.Load(s);
}
//viewer.Load(path);
viewer.SyntaxHighlighting = HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(path));
}
}
}