Code reformat and UI tweaks

This commit is contained in:
Paddy Xu
2018-07-24 22:06:06 +03:00
parent c1733a39fd
commit e7aee219b3
59 changed files with 1490 additions and 703 deletions

View File

@@ -1,4 +1,20 @@
using System;
// Copyright © 2018 Marco Gavelli and 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.Diagnostics;
using System.IO;
using System.Windows;
@@ -11,51 +27,46 @@ namespace QuickLook.Plugin.EpubViewer
{
public class BookHtmlContent : HtmlPanel
{
public static readonly DependencyProperty ChapterRefProperty = DependencyProperty.Register("ChapterRef", typeof(EpubChapterRef), typeof(BookHtmlContent), new PropertyMetadata(OnChapterRefChanged));
public static readonly DependencyProperty ChapterRefProperty = DependencyProperty.Register("ChapterRef",
typeof(EpubChapterRef), typeof(BookHtmlContent), new PropertyMetadata(OnChapterRefChanged));
public static readonly DependencyProperty EpubBookProperty = DependencyProperty.Register("EpubBook",
typeof(EpubBookRef), typeof(BookHtmlContent), new PropertyMetadata(null));
public EpubChapterRef ChapterRef
{
get { return (EpubChapterRef)GetValue(ChapterRefProperty); }
set { SetValue(ChapterRefProperty, value); }
get => (EpubChapterRef) GetValue(ChapterRefProperty);
set => SetValue(ChapterRefProperty, value);
}
public static readonly DependencyProperty EpubBookProperty = DependencyProperty.Register("EpubBook", typeof(EpubBookRef), typeof(BookHtmlContent), new PropertyMetadata(null));
public EpubBookRef EpubBook
{
get { return (EpubBookRef)GetValue(EpubBookProperty); }
set { SetValue(EpubBookProperty, value); }
get => (EpubBookRef) GetValue(EpubBookProperty);
set => SetValue(EpubBookProperty, value);
}
protected override void OnStylesheetLoad(HtmlStylesheetLoadEventArgs args)
{
string styleSheetFilePath = GetFullPath(ChapterRef.ContentFileName, args.Src);
if (EpubBook.Content.Css.TryGetValue(styleSheetFilePath, out EpubTextContentFileRef styleSheetContent))
{
var styleSheetFilePath = GetFullPath(ChapterRef.ContentFileName, args.Src);
if (EpubBook.Content.Css.TryGetValue(styleSheetFilePath, out var styleSheetContent))
args.SetStyleSheet = styleSheetContent.ReadContentAsText();
}
}
protected override async void OnImageLoad(HtmlImageLoadEventArgs args)
{
string imageFilePath = ChapterRef != null ? GetFullPath(ChapterRef.ContentFileName, args.Src) : null;
var imageFilePath = ChapterRef != null ? GetFullPath(ChapterRef.ContentFileName, args.Src) : null;
byte[] imageBytes = null;
if (args.Src == "COVER")
{
imageBytes = await EpubBook.ReadCoverAsync();
}
else if (EpubBook.Content.Images.TryGetValue(imageFilePath, out EpubByteContentFileRef imageContent))
{
else if (EpubBook.Content.Images.TryGetValue(imageFilePath, out var imageContent))
imageBytes = await imageContent.ReadContentAsBytesAsync();
}
if (imageBytes != null)
{
using (MemoryStream imageStream = new MemoryStream(imageBytes))
using (var imageStream = new MemoryStream(imageBytes))
{
try
{
BitmapImage bitmapImage = new BitmapImage();
var bitmapImage = new BitmapImage();
bitmapImage.BeginInit();
bitmapImage.StreamSource = imageStream;
bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
@@ -69,33 +80,28 @@ namespace QuickLook.Plugin.EpubViewer
Debug.WriteLine($"Failed to load image: {args.Src}");
}
}
}
}
private string GetFullPath(string htmlFilePath, string relativePath)
{
if (relativePath.StartsWith("/"))
{
return relativePath.Length > 1 ? relativePath.Substring(1) : String.Empty;
}
string basePath = System.IO.Path.GetDirectoryName(htmlFilePath);
if (relativePath.StartsWith("/")) return relativePath.Length > 1 ? relativePath.Substring(1) : string.Empty;
var basePath = Path.GetDirectoryName(htmlFilePath);
while (relativePath.StartsWith("../"))
{
relativePath = relativePath.Length > 3 ? relativePath.Substring(3) : String.Empty;
basePath = System.IO.Path.GetDirectoryName(basePath);
relativePath = relativePath.Length > 3 ? relativePath.Substring(3) : string.Empty;
basePath = Path.GetDirectoryName(basePath);
}
string fullPath = String.Concat(basePath.Replace('\\', '/'), '/', relativePath);
return fullPath.StartsWith("/") ? fullPath.Length > 1 ? fullPath.Substring(1) : String.Empty : fullPath;
var fullPath = string.Concat(basePath.Replace('\\', '/'), '/', relativePath);
return fullPath.StartsWith("/") ? fullPath.Length > 1 ? fullPath.Substring(1) : string.Empty : fullPath;
}
private static async void OnChapterRefChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
private static async void OnChapterRefChanged(DependencyObject dependencyObject,
DependencyPropertyChangedEventArgs e)
{
BookHtmlContent bookHtmlContent = dependencyObject as BookHtmlContent;
if (bookHtmlContent == null || bookHtmlContent.ChapterRef == null)
{
if (!(dependencyObject is BookHtmlContent bookHtmlContent) || bookHtmlContent.ChapterRef == null)
return;
}
bookHtmlContent.Text = await bookHtmlContent.ChapterRef.ReadHtmlContentAsync();
}
}
}
}