diff --git a/Bili-dl/Bili-dl/BiliApi.cs b/Bili-dl/Bili-dl/BiliApi.cs index cb5d687..c2316c9 100644 --- a/Bili-dl/Bili-dl/BiliApi.cs +++ b/Bili-dl/Bili-dl/BiliApi.cs @@ -7,8 +7,6 @@ using System.Security.Cryptography; using System.Text; using System.Threading.Tasks; -using System.Windows; -using System.Windows.Media.Imaging; namespace Bili { @@ -35,7 +33,7 @@ class BiliApi /// Parameter string public static string DicToParams(Dictionary dic, bool addVerification) { - if(dic != null) + if (dic != null) { if (addVerification) dic = AddVerification(dic); @@ -161,57 +159,6 @@ public static Task GetJsonResultAsync(string url, Dictionary - /// Download an Image asynchronously. - /// - /// Image url - /// Image data - public static Task GetImageAsync(string url) - { - Task task = new Task(() => - { - return GetImage(url); - }); - task.Start(); - return task; - } - - /// - /// Download an Image. - /// - /// Image url - /// Image data - public static System.Drawing.Bitmap GetImage(string url) - { - try - { - HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url); - HttpWebResponse response = (HttpWebResponse)request.GetResponse(); - Stream dataStream = response.GetResponseStream(); - System.Drawing.Bitmap bitmap = new System.Drawing.Bitmap(dataStream); - response.Close(); - dataStream.Close(); - return bitmap; - } - catch (Exception) - { - return new System.Drawing.Bitmap(1,1); - } - - } - - /// - /// Convert a bitmap to an ImageSource. - /// - /// Source bitmap - /// ImageSource - public static BitmapSource BitmapToImageSource(System.Drawing.Bitmap bitmap) - { - IntPtr ip = bitmap.GetHbitmap(); - BitmapSource bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(ip, IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions()); - return bitmapSource; - } - /// /// Formatting numbers. /// diff --git a/Bili-dl/Bili-dl/BiliDownload/DownloadOption.xaml.cs b/Bili-dl/Bili-dl/BiliDownload/DownloadOption.xaml.cs index b10cb52..bdc61e6 100644 --- a/Bili-dl/Bili-dl/BiliDownload/DownloadOption.xaml.cs +++ b/Bili-dl/Bili-dl/BiliDownload/DownloadOption.xaml.cs @@ -98,7 +98,7 @@ private void PageListItem_Selected(object sender, RoutedEventArgs e) private void ShowQualies(VideoInfo.Page page) { List qualities = page.GetQualities(); - if(qualities != null) + if (qualities != null) Dispatcher.Invoke(new Action(() => { foreach (VideoInfo.Page.Quality quality in qualities) diff --git a/Bili-dl/Bili-dl/BiliDownload/DownloadQueue.xaml.cs b/Bili-dl/Bili-dl/BiliDownload/DownloadQueue.xaml.cs index 015fc86..8343760 100644 --- a/Bili-dl/Bili-dl/BiliDownload/DownloadQueue.xaml.cs +++ b/Bili-dl/Bili-dl/BiliDownload/DownloadQueue.xaml.cs @@ -27,10 +27,10 @@ public DownloadQueue() /// Successful public bool Append(DownloadTask downloadTask) { - foreach(ListBoxItem i in QueueList.Items) + foreach (ListBoxItem i in QueueList.Items) { DownloadQueueItem dqi = (DownloadQueueItem)i.Content; - if(dqi.downloadTask.Aid == downloadTask.Aid && + if (dqi.downloadTask.Aid == downloadTask.Aid && dqi.downloadTask.Cid == downloadTask.Cid && dqi.downloadTask.Qn == downloadTask.Qn) { @@ -67,7 +67,7 @@ private void DownloadQueueItem_Finished(DownloadQueueItem downloadQueueItem) { QueueList.Items.Remove(ItemMap[downloadQueueItem]); ItemMap.Remove(downloadQueueItem); - if(QueueList.Items.Count > 0) + if (QueueList.Items.Count > 0) ((DownloadQueueItem)((ListBoxItem)QueueList.Items[0]).Content).Start(); })); ConfigManager.ConfigManager.RemoveDownloadInfo(downloadQueueItem.downloadTask.Info); @@ -80,8 +80,8 @@ private void UserControl_MouseLeftButtonDown(object sender, MouseButtonEventArgs public void StopAll() { - foreach(ListBoxItem listBoxItem in QueueList.Items) - if(((DownloadQueueItem)listBoxItem.Content).downloadTask.IsRunning) + foreach (ListBoxItem listBoxItem in QueueList.Items) + if (((DownloadQueueItem)listBoxItem.Content).downloadTask.IsRunning) ((DownloadQueueItem)listBoxItem.Content).downloadTask.Stop(); } diff --git a/Bili-dl/Bili-dl/BiliDownload/DownloadQueueItem.xaml.cs b/Bili-dl/Bili-dl/BiliDownload/DownloadQueueItem.xaml.cs index 54335b7..038f304 100644 --- a/Bili-dl/Bili-dl/BiliDownload/DownloadQueueItem.xaml.cs +++ b/Bili-dl/Bili-dl/BiliDownload/DownloadQueueItem.xaml.cs @@ -83,7 +83,7 @@ private void DownloadTask_AnalysisFailed(DownloadTask downloadTask) { } - + } private void DownloadTask_StatusUpdate(double progressPercentage, long bps, DownloadTask.Status status) diff --git a/Bili-dl/Bili-dl/BiliDownload/DownloadTask.cs b/Bili-dl/Bili-dl/BiliDownload/DownloadTask.cs index 5bc88a5..0dc97e3 100644 --- a/Bili-dl/Bili-dl/BiliDownload/DownloadTask.cs +++ b/Bili-dl/Bili-dl/BiliDownload/DownloadTask.cs @@ -74,7 +74,7 @@ private bool Analysis() try { IJson json = BiliApi.GetJsonResult("https://api.bilibili.com/x/player/playurl", dic, false); - if(json.GetValue("code").ToLong() == 0) + if (json.GetValue("code").ToLong() == 0) if (json.GetValue("data").GetValue("quality").ToLong() == Qn) foreach (IJson v in json.GetValue("data").GetValue("durl")) { @@ -110,7 +110,7 @@ private bool Analysis() private void Segment_Finished() { - if(CurrentSegment < Segments.Count-1) + if (CurrentSegment < Segments.Count - 1) { CurrentSegment++; Segments[CurrentSegment].Download(); @@ -194,7 +194,7 @@ public void Stop() runThread.Abort(); if (!IsFinished && IsRunning) { - if(CurrentSegment != -1) + if (CurrentSegment != -1) Segments[CurrentSegment].AbortDownload(); AbortProgressMonitor(); IsRunning = false; @@ -212,7 +212,7 @@ public void Clean() if (Segments != null) foreach (Segment segment in Segments) segment.Clean(); - } + } } private void StartProgressMonitor() @@ -234,7 +234,7 @@ private void AbortProgressMonitor() private void ProgressMonitor() { long total = 0; - foreach(Segment segment in Segments) + foreach (Segment segment in Segments) { total += segment.Length; } @@ -298,7 +298,7 @@ public Segment(uint aid, string url, SegmentType segmentType, long contentLength Filepath = string.Format("{0}{1}", directory, Url.Substring(Url.LastIndexOf('/') + 1, Url.IndexOf('?') - Url.LastIndexOf('/') - 1)); Threads = threads; DownloadThreads = new List(); - for (int i=0; i < threads; i++) + for (int i = 0; i < threads; i++) { DownloadThread downloadThread; if (i != threads - 1) @@ -338,7 +338,7 @@ public void Download() foreach (DownloadThread downloadThread in DownloadThreads) { downloadThread.StartDownloadThread(); - } + } } /// @@ -370,7 +370,7 @@ public void Clean() private void DownloadThread_Finished() { FinishedThreadCount++; - if(FinishedThreadCount == DownloadThreads.Count) + if (FinishedThreadCount == DownloadThreads.Count) { bool flag = true; foreach (DownloadThread downloadThread in DownloadThreads) diff --git a/Bili-dl/Bili-dl/BiliDownload/Flv.cs b/Bili-dl/Bili-dl/BiliDownload/Flv.cs index 0f1767d..fd09514 100644 --- a/Bili-dl/Bili-dl/BiliDownload/Flv.cs +++ b/Bili-dl/Bili-dl/BiliDownload/Flv.cs @@ -19,7 +19,7 @@ public static void Merge(List inputs, string output) { FileStream outputStream = new FileStream(output, FileMode.Create); int timeOffest = 0; - for(int i=0; i @@ -62,7 +62,7 @@ public static VideoInfo GetInfo(uint id, bool isSeason) { return null; } - + } else { @@ -71,7 +71,7 @@ public static VideoInfo GetInfo(uint id, bool isSeason) try { IJson json = BiliApi.GetJsonResult("https://bangumi.bilibili.com/view/web_api/season", dic, false); - if(json.GetValue("code").ToLong() == 0) + if (json.GetValue("code").ToLong() == 0) return new VideoInfo(json.GetValue("result"), isSeason); return null; } @@ -79,9 +79,9 @@ public static VideoInfo GetInfo(uint id, bool isSeason) { return null; } - + } - + } /// @@ -140,7 +140,7 @@ public Page(string title, uint aid, IJson json, bool isSeason) Part = json.GetValue("index_title").ToString(); Duration = (uint)json.GetValue("duration").ToLong(); } - + } /// @@ -158,8 +158,8 @@ public List GetQualities() IJson json = BiliApi.GetJsonResult("https://api.bilibili.com/x/player/playurl", dic, false); Qualities = new List(); if (json.GetValue("code").ToLong() == 0) - for (int i = 0; i < ((JsonArray)json.GetValue("data").GetValue("accept_quality")).Count; i++) - Qualities.Add(new Quality(Title, Index, Num, Part, Aid, Cid, (uint)json.GetValue("data").GetValue("accept_quality").GetValue(i).ToLong(), json.GetValue("data").GetValue("accept_description").GetValue(i).ToString(), false)); + for (int i = 0; i < ((JsonArray)json.GetValue("data").GetValue("accept_quality")).Count; i++) + Qualities.Add(new Quality(Title, Index, Num, Part, Aid, Cid, (uint)json.GetValue("data").GetValue("accept_quality").GetValue(i).ToLong(), json.GetValue("data").GetValue("accept_description").GetValue(i).ToString(), false)); else if (IsSeason) { json = BiliApi.GetJsonResult("http://api.bilibili.com/pgc/player/web/playurl", dic, false); @@ -175,7 +175,7 @@ public List GetQualities() { return null; } - + } /// @@ -239,13 +239,13 @@ public Quality(string title, string index, uint num, string part, uint aid, uint IJson json = BiliApi.GetJsonResult("http://api.bilibili.com/pgc/player/web/playurl", dic, false); IsAvaliable = json.GetValue("result").GetValue("quality").ToLong() == Qn; } - + } catch (System.Net.WebException) { IsAvaliable = false; } - + } } } diff --git a/Bili-dl/Bili-dl/BiliLogin/BiliLoginQR.cs b/Bili-dl/Bili-dl/BiliLogin/BiliLoginQR.cs index 2517539..6f3d8f6 100644 --- a/Bili-dl/Bili-dl/BiliLogin/BiliLoginQR.cs +++ b/Bili-dl/Bili-dl/BiliLogin/BiliLoginQR.cs @@ -89,7 +89,7 @@ class BiliLoginQR public BiliLoginQR(Window parent) { isTimeout = false; - if(parent != null) + if (parent != null) parent.Closed += Parent_Closed; } @@ -154,7 +154,7 @@ public bool Init() private void LoginListener() { - while(!Init()) + while (!Init()) { Thread.Sleep(5000); } diff --git a/Bili-dl/Bili-dl/BiliLogin/MoblieLoginWindow.xaml.cs b/Bili-dl/Bili-dl/BiliLogin/MoblieLoginWindow.xaml.cs index eb005b9..3d6f2b5 100644 --- a/Bili-dl/Bili-dl/BiliLogin/MoblieLoginWindow.xaml.cs +++ b/Bili-dl/Bili-dl/BiliLogin/MoblieLoginWindow.xaml.cs @@ -1,9 +1,9 @@ -using Bili; -using System; +using System; using System.Drawing; using System.Net; using System.Windows; using System.Windows.Input; +using System.Windows.Media.Imaging; namespace BiliLogin { @@ -50,7 +50,7 @@ public partial class MoblieLoginWindow : Window public MoblieLoginWindow(Window parent) { InitializeComponent(); - if(parent != null) + if (parent != null) parent.Closed += Parent_Closed; } @@ -94,11 +94,15 @@ public void RefreshQRCode() biliLoginQR.Begin(); } + [System.Runtime.InteropServices.DllImport("gdi32")] static extern int DeleteObject(IntPtr o); private void BiliLoginQR_QRImageLoaded(BiliLoginQR sender, Bitmap qrImage) { Dispatcher.Invoke(new Action(() => { - QrImageBox.Source = BiliApi.BitmapToImageSource(qrImage); + IntPtr hBitmapIntPtr = qrImage.GetHbitmap(); + BitmapSource bitmapSource = System.Windows.Interop.Imaging.CreateBitmapSourceFromHBitmap(hBitmapIntPtr, IntPtr.Zero, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions()); + DeleteObject(hBitmapIntPtr); + QrImageBox.Source = bitmapSource; })); } diff --git a/Bili-dl/Bili-dl/BiliLogin/QRCoder/AbstractQRCode.cs b/Bili-dl/Bili-dl/BiliLogin/QRCoder/AbstractQRCode.cs index 3a85d2d..0840956 100644 --- a/Bili-dl/Bili-dl/BiliLogin/QRCoder/AbstractQRCode.cs +++ b/Bili-dl/Bili-dl/BiliLogin/QRCoder/AbstractQRCode.cs @@ -4,10 +4,12 @@ public abstract class AbstractQRCode { protected QRCodeData QrCodeData { get; set; } - protected AbstractQRCode() { + protected AbstractQRCode() + { } - protected AbstractQRCode(QRCodeData data) { + protected AbstractQRCode(QRCodeData data) + { this.QrCodeData = data; } @@ -15,7 +17,8 @@ protected AbstractQRCode(QRCodeData data) { /// Set a QRCodeData object that will be used to generate QR code. Used in COM Objects connections /// /// Need a QRCodeData object generated by QRCodeGenerator.CreateQrCode() - virtual public void SetQRCodeData(QRCodeData data) { + virtual public void SetQRCodeData(QRCodeData data) + { this.QrCodeData = data; } diff --git a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCode.cs b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCode.cs index 72ecaac..3a462c0 100644 --- a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCode.cs +++ b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCode.cs @@ -13,7 +13,7 @@ public class QRCode : AbstractQRCode, IDisposable /// public QRCode() { } - public QRCode(QRCodeData data) : base(data) {} + public QRCode(QRCodeData data) : base(data) { } public Bitmap GetGraphic(int pixelsPerModule) { @@ -36,7 +36,7 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, { for (var y = 0; y < size + offset; y = y + pixelsPerModule) { - var module = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule)/pixelsPerModule - 1][(x + pixelsPerModule)/pixelsPerModule - 1]; + var module = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule) / pixelsPerModule - 1][(x + pixelsPerModule) / pixelsPerModule - 1]; if (module) { gfx.FillRectangle(new SolidBrush(darkColor), new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule)); @@ -52,7 +52,7 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, return bmp; } - public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, Bitmap icon=null, int iconSizePercent=15, int iconBorderWidth = 6, bool drawQuietZones = true) + public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, Bitmap icon = null, int iconSizePercent = 15, int iconBorderWidth = 6, bool drawQuietZones = true) { var size = (this.QrCodeData.ModuleMatrix.Count - (drawQuietZones ? 0 : 8)) * pixelsPerModule; var offset = drawQuietZones ? 0 : 4 * pixelsPerModule; @@ -64,10 +64,10 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, gfx.CompositingQuality = CompositingQuality.HighQuality; gfx.Clear(lightColor); - var drawIconFlag = icon != null && iconSizePercent>0 && iconSizePercent<=100; + var drawIconFlag = icon != null && iconSizePercent > 0 && iconSizePercent <= 100; GraphicsPath iconPath = null; - float iconDestWidth=0, iconDestHeight=0, iconX=0, iconY=0; + float iconDestWidth = 0, iconDestHeight = 0, iconX = 0, iconY = 0; if (drawIconFlag) { @@ -84,15 +84,15 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, var darkBrush = new SolidBrush(darkColor); - for (var x = 0; x < size+offset; x = x + pixelsPerModule) + for (var x = 0; x < size + offset; x = x + pixelsPerModule) { for (var y = 0; y < size + offset; y = y + pixelsPerModule) { - var module = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule)/pixelsPerModule - 1][(x + pixelsPerModule)/pixelsPerModule - 1]; + var module = this.QrCodeData.ModuleMatrix[(y + pixelsPerModule) / pixelsPerModule - 1][(x + pixelsPerModule) / pixelsPerModule - 1]; if (module) { - var r = new Rectangle(x-offset, y-offset, pixelsPerModule, pixelsPerModule); + var r = new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule); if (drawIconFlag) { @@ -106,7 +106,7 @@ public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, } } else - gfx.FillRectangle(lightBrush, new Rectangle(x-offset, y-offset, pixelsPerModule, pixelsPerModule)); + gfx.FillRectangle(lightBrush, new Rectangle(x - offset, y - offset, pixelsPerModule, pixelsPerModule)); } } diff --git a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeData.cs b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeData.cs index 0f0a11c..77ee2bd 100644 --- a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeData.cs +++ b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeData.cs @@ -1,6 +1,5 @@ using System.Collections; using System.Collections.Generic; -using System.Linq; namespace QRCoder { @@ -92,7 +91,7 @@ public byte[] GetRawData(Compression compressMode) var bytes = new List(); //Add header - signature ("QRR") - bytes.AddRange(new byte[]{ 0x51, 0x52, 0x52, 0x00 }); + bytes.AddRange(new byte[] { 0x51, 0x52, 0x52, 0x00 }); //Add header - rowsize bytes.Add((byte)ModuleMatrix.Count); diff --git a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeGenerator.cs b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeGenerator.cs index f1e8b14..65e6210 100644 --- a/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeGenerator.cs +++ b/Bili-dl/Bili-dl/BiliLogin/QRCoder/QRCodeGenerator.cs @@ -1,9 +1,9 @@ using System; +using System.Collections; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Collections; using System.Reflection; +using System.Text; namespace QRCoder { @@ -310,11 +310,11 @@ public static int MaskCode(ref QRCodeData qrCode, int version, ref List= 7) { @@ -361,11 +361,11 @@ public static int MaskCode(ref QRCodeData qrCode, int version, ref List x.Name == patternName); - #else - var patterMethod = typeof(MaskPattern).GetTypeInfo().GetDeclaredMethod(patternName); - #endif +#else + var patterMethod = typeof(MaskPattern).GetTypeInfo().GetDeclaredMethod(patternName); +#endif for (var x = 0; x < size; x++) @@ -387,7 +387,7 @@ public static void PlaceDataWords(ref QRCodeData qrCode, string data, ref List(); - for (int i = 0; i< data.Length; i++) + for (int i = 0; i < data.Length; i++) { datawords.Enqueue(data[i] != '0'); } @@ -703,9 +703,9 @@ public static int Score(ref QRCodeData qrCode) blackModules++; var percent = (blackModules / (qrCode.ModuleMatrix.Count * qrCode.ModuleMatrix.Count)) * 100; - var prevMultipleOf5 = Math.Abs((int) Math.Floor(percent/5)*5 - 50)/5; - var nextMultipleOf5 = Math.Abs((int)Math.Floor(percent / 5) * 5 -45)/5; - score4 = Math.Min(prevMultipleOf5, nextMultipleOf5)*10; + var prevMultipleOf5 = Math.Abs((int)Math.Floor(percent / 5) * 5 - 50) / 5; + var nextMultipleOf5 = Math.Abs((int)Math.Floor(percent / 5) * 5 - 45) / 5; + score4 = Math.Min(prevMultipleOf5, nextMultipleOf5) * 10; return score1 + score2 + score3 + score4; } @@ -725,7 +725,7 @@ private List CalculateECCWords(string bitString, ECCInfo eccInfo) for (var i = 0; i < generatorPolynom.PolyItems.Count; i++) generatorPolynom.PolyItems[i] = new PolynomItem(generatorPolynom.PolyItems[i].Coefficient, - generatorPolynom.PolyItems[i].Exponent + (messagePolynom.PolyItems.Count-1)); + generatorPolynom.PolyItems[i].Exponent + (messagePolynom.PolyItems.Count - 1)); var leadTermSource = messagePolynom; for (var i = 0; (leadTermSource.PolyItems.Count > 0 && leadTermSource.PolyItems[leadTermSource.PolyItems.Count - 1].Exponent > 0); i++) @@ -907,13 +907,13 @@ private bool IsValidISO(string input) { var bytes = Encoding.GetEncoding("ISO-8859-1").GetBytes(input); //var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes); - var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes,0,bytes.Length); + var result = Encoding.GetEncoding("ISO-8859-1").GetString(bytes, 0, bytes.Length); return String.Equals(input, result); } private string PlainTextToBinary(string plainText, EncodingMode encMode, EciMode eciMode, bool utf8BOM, bool forceUtf8) { - switch(encMode) + switch (encMode) { case EncodingMode.Alphanumeric: return PlainTextToBinaryAlphanumeric(plainText); @@ -974,7 +974,7 @@ private string PlainTextToBinaryECI(string plainText) { var codeText = string.Empty; byte[] _bytes = Encoding.GetEncoding("ascii").GetBytes(plainText); - foreach(byte _byte in _bytes) + foreach (byte _byte in _bytes) { codeText += DecToBin(_byte, 8); } @@ -999,7 +999,7 @@ private string PlainTextToBinaryByte(string plainText, EciMode eciMode, bool utf codeBytes = Encoding.GetEncoding("ISO-8859-1").GetBytes(plainText); else { - switch(eciMode) + switch (eciMode) { case EciMode.Iso8859_1: codeBytes = Encoding.GetEncoding("ISO-8859-1").GetBytes(ConvertToIso8859(plainText, "ISO-8859-1")); diff --git a/Bili-dl/Bili-dl/BiliLogin/UserInfo.cs b/Bili-dl/Bili-dl/BiliLogin/UserInfo.cs index aa68951..af07e97 100644 --- a/Bili-dl/Bili-dl/BiliLogin/UserInfo.cs +++ b/Bili-dl/Bili-dl/BiliLogin/UserInfo.cs @@ -1,6 +1,5 @@ using Bili; using Json; -using System.Drawing; using System.Net; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -63,7 +62,7 @@ public static UserInfo GetUserInfo(CookieCollection cookies) { return null; } - + } public async static Task GetUserInfoAsync(CookieCollection cookies) @@ -80,37 +79,7 @@ public async static Task GetUserInfoAsync(CookieCollection cookies) { return null; } - - } - - public Bitmap GetFaceBitmap() - { - return BiliApi.GetImage(Face); - } - - public async Task GetFaceBitmapAsync() - { - return await BiliApi.GetImageAsync(Face); - } - - public Bitmap GetNamePlateBitmap() - { - return BiliApi.GetImage(NameplateCurrent); - } - - public async Task GetNamePlateBitmapAsync() - { - return await BiliApi.GetImageAsync(NameplateCurrent); - } - public Bitmap GetPendantBitmap() - { - return BiliApi.GetImage(PendantCurrent); - } - - public async Task GetPendantBitmapAsync() - { - return await BiliApi.GetImageAsync(PendantCurrent); } } } diff --git a/Bili-dl/Bili-dl/BiliSearch/HistoryList.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/HistoryList.xaml.cs index b0a4e0f..fd21ed3 100644 --- a/Bili-dl/Bili-dl/BiliSearch/HistoryList.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/HistoryList.xaml.cs @@ -38,7 +38,7 @@ public HistoryList() public void SetHistory(List history) { History = history; - foreach(string text in history) + foreach (string text in history) HistoryListBox.Items.Add(CreateItem(text)); if (History.Count == 0) ClearListBtn.Visibility = Visibility.Hidden; diff --git a/Bili-dl/Bili-dl/BiliSearch/PageNavigation.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/PageNavigation.xaml.cs index 51039f5..8f79308 100644 --- a/Bili-dl/Bili-dl/BiliSearch/PageNavigation.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/PageNavigation.xaml.cs @@ -1,17 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BiliSearch { @@ -40,7 +28,7 @@ public void SetPage(int pageCount, int currentPage, bool auto) Wrapper.Children.Clear(); - if(currentPage > 1) + if (currentPage > 1) Wrapper.Children.Add(new Button { Style = (Style)Resources["TextButtonStyle"], @@ -49,7 +37,7 @@ public void SetPage(int pageCount, int currentPage, bool auto) }); if (currentPage < 5) - for(int i = 1; i < currentPage; i++) + for (int i = 1; i < currentPage; i++) Wrapper.Children.Add(new Button { Style = (Style)Resources["NumberButtonStyle"], @@ -68,7 +56,7 @@ public void SetPage(int pageCount, int currentPage, bool auto) { Style = (Style)Resources["EllipsisButtonStyle"] }); - for(int i = currentPage - 3; i < currentPage; i++) + for (int i = currentPage - 3; i < currentPage; i++) Wrapper.Children.Add(new Button { Style = (Style)Resources["NumberButtonStyle"], @@ -94,7 +82,7 @@ public void SetPage(int pageCount, int currentPage, bool auto) }); else { - + for (int i = currentPage + 1; i < currentPage + 4; i++) Wrapper.Children.Add(new Button { diff --git a/Bili-dl/Bili-dl/BiliSearch/ResultBox.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/ResultBox.xaml.cs index a32f58d..ab81884 100644 --- a/Bili-dl/Bili-dl/BiliSearch/ResultBox.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/ResultBox.xaml.cs @@ -69,18 +69,13 @@ public Video(IJson json) Pic = "https:" + Regex.Unescape(json.GetValue("pic").ToString()); Title = System.Net.WebUtility.HtmlDecode(Regex.Unescape(json.GetValue("title").ToString())); Play = json.GetValue("play").ToLong(); - if(json.Contains("pubdate")) + if (json.Contains("pubdate")) Pubdate = json.GetValue("pubdate").ToLong(); else Pubdate = json.GetValue("created").ToLong(); Author = Regex.Unescape(json.GetValue("author").ToString()); Aid = json.GetValue("aid").ToLong(); } - - public Task GetPicAsync() - { - return BiliApi.GetImageAsync(Pic); - } } /// @@ -114,11 +109,6 @@ public Season(IJson json, IJson cardsJson) SeasonTypeName = cardsJson.GetValue("result").GetValue(SeasonId.ToString()).GetValue("season_type_name").ToString(); OrgTitle = System.Net.WebUtility.HtmlDecode(Regex.Unescape(json.GetValue("org_title").ToString())); } - - public Task GetCoverAsync() - { - return BiliApi.GetImageAsync(Cover); - } } /// @@ -144,11 +134,6 @@ public User(IJson json) Fans = json.GetValue("fans").ToLong(); Usign = Regex.Unescape(json.GetValue("usign").ToString()); } - - public Task GetPicAsync() - { - return BiliApi.GetImageAsync(Upic); - } } public ResultBox() @@ -226,7 +211,7 @@ private IJson GetResult(string text, string type, int pagenum) { return null; } - + } private async void ShowResult(IJson json, string type) @@ -310,7 +295,7 @@ private async void ShowResult(IJson json, string type) else { NoMoreGrid.Visibility = Visibility.Visible; - } + } } private void ResultUser_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e) @@ -337,7 +322,7 @@ private void RadioButton_Checked(object sender, RoutedEventArgs e) SearchAsync(SearchText, 1); } } - + public void SetHistory(List history) { HistoryBox.SetHistory(history); diff --git a/Bili-dl/Bili-dl/BiliSearch/ResultSeason.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/ResultSeason.xaml.cs index 39050cf..c534609 100644 --- a/Bili-dl/Bili-dl/BiliSearch/ResultSeason.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/ResultSeason.xaml.cs @@ -1,10 +1,9 @@ -using Bili; -using System; +using System; using System.Text.RegularExpressions; -using System.Windows; using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; +using System.Windows.Media.Imaging; namespace BiliSearch { @@ -53,11 +52,7 @@ public ResultSeason(ResultBox.Season season) CvBox.Text = season.Cv.Replace('\n', ' '); DescriptionBox.Text = season.Description.Replace('\n', ' '); - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await season.GetCoverAsync(); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(season.Cover)); } } } diff --git a/Bili-dl/Bili-dl/BiliSearch/ResultUser.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/ResultUser.xaml.cs index 01a2f59..2b23b72 100644 --- a/Bili-dl/Bili-dl/BiliSearch/ResultUser.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/ResultUser.xaml.cs @@ -1,6 +1,7 @@ using Bili; -using System.Windows; +using System; using System.Windows.Controls; +using System.Windows.Media.Imaging; namespace BiliSearch { @@ -22,11 +23,7 @@ public ResultUser(ResultBox.User user) FansBox.Text = BiliApi.FormatNum(user.Fans, 1); UsignBox.Text = user.Usign; - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await user.GetPicAsync(); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(user.Upic)); } } } diff --git a/Bili-dl/Bili-dl/BiliSearch/ResultVideo.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/ResultVideo.xaml.cs index ba6f2f9..2859e19 100644 --- a/Bili-dl/Bili-dl/BiliSearch/ResultVideo.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/ResultVideo.xaml.cs @@ -1,10 +1,10 @@ using Bili; using System; using System.Text.RegularExpressions; -using System.Windows; using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; +using System.Windows.Media.Imaging; namespace BiliSearch { @@ -46,13 +46,9 @@ public ResultVideo(ResultBox.Video video) PostdateBox.Text = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(video.Pubdate).ToString("yyyy-MM-dd"); AuthorBox.Text = video.Author; - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await video.GetPicAsync(); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(video.Pic)); } - + } } diff --git a/Bili-dl/Bili-dl/BiliSearch/SearchBox.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/SearchBox.xaml.cs index 4574d8d..7776908 100644 --- a/Bili-dl/Bili-dl/BiliSearch/SearchBox.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/SearchBox.xaml.cs @@ -46,7 +46,7 @@ public int SuggestDelay } private void SuggestDelayChanged(object sender, EventArgs e) { - + } public string Text @@ -101,11 +101,6 @@ public SeasonSuggest(IJson item) else Label = null; } - - public Task GetCoverAsync() - { - return BiliApi.GetImageAsync(Cover); - } } /// @@ -132,11 +127,6 @@ public UserSuggest(IJson item) Fans = item.GetValue("fans").ToLong(); Archives = item.GetValue("archives").ToLong(); } - - public Task GetCoverAsync() - { - return BiliApi.GetImageAsync(Cover); - } } /// @@ -180,7 +170,7 @@ private async void InputBox_TextChanged(object sender, TextChangedEventArgs e) { List suggests = null; suggests = await GetSuggestAsync(InputBox.Text, SuggestDelay); - + SuggestList.Items.Clear(); if (suggests != null) { @@ -219,9 +209,9 @@ private async void InputBox_TextChanged(object sender, TextChangedEventArgs e) private CancellationTokenSource cancellationTokenSource; private Task> GetSuggestAsync(string text, int delay) { - if(cancellationTokenSource != null) + if (cancellationTokenSource != null) cancellationTokenSource.Cancel(); - + cancellationTokenSource = new CancellationTokenSource(); CancellationToken cancellationToken = cancellationTokenSource.Token; Task> task = new Task>(() => @@ -284,7 +274,7 @@ private List GetSuggest(string text) { return null; } - + } @@ -296,7 +286,7 @@ private void InputBox_PreviewKeyDown(object sender, KeyEventArgs e) SuggestList.SelectedIndex = 0; e.Handled = true; } - else if(e.Key == Key.Enter) + else if (e.Key == Key.Enter) { Confirm(); e.Handled = true; @@ -307,11 +297,11 @@ private void SuggestList_PreviewKeyDown(object sender, KeyEventArgs e) { if (e.Key == Key.Down) { - if(SuggestList.SelectedIndex < SuggestList.Items.Count - 1) + if (SuggestList.SelectedIndex < SuggestList.Items.Count - 1) SuggestList.SelectedIndex++; e.Handled = true; } - else if(e.Key == Key.Up) + else if (e.Key == Key.Up) { SuggestList.SelectedIndex--; if (SuggestList.SelectedIndex == -1) diff --git a/Bili-dl/Bili-dl/BiliSearch/SearchPanel.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/SearchPanel.xaml.cs index 9cd6888..dd412ed 100644 --- a/Bili-dl/Bili-dl/BiliSearch/SearchPanel.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/SearchPanel.xaml.cs @@ -1,17 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using System.Collections.Generic; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BiliSearch { @@ -76,6 +66,6 @@ private void UserVideoGrid_MouseLeftButtonDown(object sender, MouseButtonEventAr UserVideoListBox.Visibility = Visibility.Hidden; } - + } } diff --git a/Bili-dl/Bili-dl/BiliSearch/SuggestItemSeason.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/SuggestItemSeason.xaml.cs index e4422e8..b8083bf 100644 --- a/Bili-dl/Bili-dl/BiliSearch/SuggestItemSeason.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/SuggestItemSeason.xaml.cs @@ -1,7 +1,6 @@ -using Bili; -using System; -using System.Windows; +using System; using System.Windows.Controls; +using System.Windows.Media.Imaging; namespace BiliSearch { @@ -16,7 +15,7 @@ public SuggestItemSeason(SearchBox.SeasonSuggest seasonSuggest) { InitializeComponent(); - if(TitleInline.Text != null) + if (TitleInline.Text != null) TitleInline.Text = seasonSuggest.Title; InfoInline.Text = string.Format("{0} | {1} | {2}", TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(seasonSuggest.Ptime).Year, seasonSuggest.SeasonTypeName, seasonSuggest.Area); @@ -24,11 +23,7 @@ public SuggestItemSeason(SearchBox.SeasonSuggest seasonSuggest) if (seasonSuggest.Label != null) LabelInline.Text = seasonSuggest.Label; - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await seasonSuggest.GetCoverAsync(); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(seasonSuggest.Cover)); } } } diff --git a/Bili-dl/Bili-dl/BiliSearch/SuggestItemUser.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/SuggestItemUser.xaml.cs index cc12c13..49fbea6 100644 --- a/Bili-dl/Bili-dl/BiliSearch/SuggestItemUser.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/SuggestItemUser.xaml.cs @@ -1,6 +1,7 @@ using Bili; -using System.Windows; +using System; using System.Windows.Controls; +using System.Windows.Media.Imaging; namespace BiliSearch { @@ -22,11 +23,7 @@ public SuggestItemUser(SearchBox.UserSuggest userSuggest) ArchivesInline.Text = string.Format("{0:0}个视频", BiliApi.FormatNum(userSuggest.Archives, 1)); - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await userSuggest.GetCoverAsync(); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(userSuggest.Cover)); } } } diff --git a/Bili-dl/Bili-dl/BiliSearch/UserVideoList.xaml.cs b/Bili-dl/Bili-dl/BiliSearch/UserVideoList.xaml.cs index baf319f..aacdcad 100644 --- a/Bili-dl/Bili-dl/BiliSearch/UserVideoList.xaml.cs +++ b/Bili-dl/Bili-dl/BiliSearch/UserVideoList.xaml.cs @@ -2,19 +2,11 @@ using Json; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BiliSearch { diff --git a/Bili-dl/Bili-dl/BiliUser/FavItem.xaml.cs b/Bili-dl/Bili-dl/BiliUser/FavItem.xaml.cs index dd9e4ff..03415a5 100644 --- a/Bili-dl/Bili-dl/BiliUser/FavItem.xaml.cs +++ b/Bili-dl/Bili-dl/BiliUser/FavItem.xaml.cs @@ -1,18 +1,6 @@ -using Bili; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; +using System; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BiliUser { @@ -38,11 +26,7 @@ public FavItem(string title, string cover, long info, long id, bool isFolder) InfoBox.Text = string.Format("收藏于: {0}", TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1)).AddSeconds(info).ToString("yyyy-MM-dd")); if (cover != null) - this.Loaded += async delegate (object senderD, RoutedEventArgs eD) - { - System.Drawing.Bitmap bitmap = await BiliApi.GetImageAsync(cover); - ImageBox.Source = BiliApi.BitmapToImageSource(bitmap); - }; + ImageBox.Source = new BitmapImage(new Uri(cover)); } } } diff --git a/Bili-dl/Bili-dl/BiliUser/FavList.xaml.cs b/Bili-dl/Bili-dl/BiliUser/FavList.xaml.cs index ecb2084..c744380 100644 --- a/Bili-dl/Bili-dl/BiliUser/FavList.xaml.cs +++ b/Bili-dl/Bili-dl/BiliUser/FavList.xaml.cs @@ -2,19 +2,11 @@ using Json; using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; namespace BiliUser { @@ -138,8 +130,8 @@ private void ShowFolder(int mediaId, int pagenum, bool init) favItem.PreviewMouseLeftButtonDown += FavItem_PreviewMouseLeftButtonDown; ContentPanel.Children.Add(favItem); } - if(init) - PagesBox.SetPage((int)Math.Ceiling((double)json.GetValue("data").GetValue("info").GetValue("media_count").ToLong()/20), 1, true); + if (init) + PagesBox.SetPage((int)Math.Ceiling((double)json.GetValue("data").GetValue("info").GetValue("media_count").ToLong() / 20), 1, true); PagesBox.Visibility = Visibility.Visible; })); } diff --git a/Bili-dl/Bili-dl/ConfigManager.cs b/Bili-dl/Bili-dl/ConfigManager.cs index 004457e..27c19a5 100644 --- a/Bili-dl/Bili-dl/ConfigManager.cs +++ b/Bili-dl/Bili-dl/ConfigManager.cs @@ -49,7 +49,7 @@ public static void Init() { config = Deserialize(); - if(config.DownloadInfos == null) + if (config.DownloadInfos == null) config.DownloadInfos = new List(); if (config.Settings == null) config.Settings = new SettingPanel.Settings(); diff --git a/Bili-dl/Bili-dl/Framework/WindowLong.cs b/Bili-dl/Bili-dl/Framework/WindowLong.cs index 4101c3c..0021812 100644 --- a/Bili-dl/Bili-dl/Framework/WindowLong.cs +++ b/Bili-dl/Bili-dl/Framework/WindowLong.cs @@ -50,7 +50,7 @@ class WindowLong public static uint WS_TILEDWINDOW = (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX); public static uint WS_VISIBLE = 0x10000000; public static uint WS_VSCROLL = 0x00200000; - + public static uint WS_EX_ACCEPTFILES = 0x00000010; public static uint WS_EX_APPWINDOW = 0x00040000; public static uint WS_EX_CLIENTEDGE = 0x00000200; diff --git a/Bili-dl/Bili-dl/Json/JsonParser.cs b/Bili-dl/Bili-dl/Json/JsonParser.cs index 5e54ce3..4d93946 100644 --- a/Bili-dl/Bili-dl/Json/JsonParser.cs +++ b/Bili-dl/Bili-dl/Json/JsonParser.cs @@ -64,7 +64,7 @@ private static IJson ParseValue(StringReader stringReader) else if (stringReader.Peek() == '{') { JsonObject jsonObject = ParseObject(stringReader); - while (stringReader.Peek() != -1 && (stringReader.Peek() == ',' || stringReader.Peek() == ' ' || stringReader.Peek() == '\r' || stringReader.Peek() == '\n')) + while (stringReader.Peek() != -1 && (stringReader.Peek() == ',' || stringReader.Peek() == ' ' || stringReader.Peek() == '\r' || stringReader.Peek() == '\n')) stringReader.Read(); return jsonObject; } diff --git a/Bili-dl/Bili-dl/MainWindow.xaml.cs b/Bili-dl/Bili-dl/MainWindow.xaml.cs index ab784ed..dc24fd6 100644 --- a/Bili-dl/Bili-dl/MainWindow.xaml.cs +++ b/Bili-dl/Bili-dl/MainWindow.xaml.cs @@ -8,6 +8,7 @@ using System.Windows; using System.Windows.Input; using System.Windows.Interop; +using System.Windows.Media.Imaging; namespace Bili_dl { @@ -58,7 +59,7 @@ private async void LoadConfig() ShowUserInfo(userInfo); LoginBtn.Content = "登出"; } - } + } } protected override void OnSourceInitialized(EventArgs e) @@ -107,7 +108,7 @@ private void Header_MouseLeftButtonDown(object sender, MouseButtonEventArgs e) private void LoginBtn_Click(object sender, RoutedEventArgs e) { - if(LoginBtn.Content.ToString() == "登录") + if (LoginBtn.Content.ToString() == "登录") { MoblieLoginWindow moblieLoginWindow = new MoblieLoginWindow(this); moblieLoginWindow.LoggedIn += MoblieLoginWindow_LoggedIn; @@ -115,7 +116,7 @@ private void LoginBtn_Click(object sender, RoutedEventArgs e) moblieLoginWindow.Show(); LoginBtn.Content = "登录中..."; } - else if(LoginBtn.Content.ToString() == "登出") + else if (LoginBtn.Content.ToString() == "登出") { BiliApi.CookieCollection = null; ConfigManager.ConfigManager.SetCookieCollection(null); @@ -124,7 +125,7 @@ private void LoginBtn_Click(object sender, RoutedEventArgs e) ShowFavoritesBtn.Visibility = Visibility.Collapsed; LoginBtn.Content = "登录"; } - + } private void MoblieLoginWindow_Canceled(MoblieLoginWindow sender) @@ -144,17 +145,17 @@ private void MoblieLoginWindow_LoggedIn(MoblieLoginWindow sender, System.Net.Coo UserInfo userInfo = await UserInfo.GetUserInfoAsync(BiliApi.CookieCollection); - if(userInfo != null) + if (userInfo != null) { ShowUserInfo(userInfo); LoginBtn.Content = "登出"; } sender.Close(); - + })); } - private async void ShowUserInfo(UserInfo userInfo) + private void ShowUserInfo(UserInfo userInfo) { ShowFavoritesBtn.Visibility = Visibility.Visible; @@ -165,7 +166,7 @@ private async void ShowUserInfo(UserInfo userInfo) stringBuilder.Append(" [大会员]"); UserInfoBox.Text = stringBuilder.ToString(); - UserFaceImage.Source = BiliApi.BitmapToImageSource(await userInfo.GetFaceBitmapAsync()); + UserFaceImage.Source = new BitmapImage(new Uri(userInfo.Face)); } #endregion @@ -209,7 +210,7 @@ private void DownloadOptionPanel_TaskCreated(DownloadTask downloadTask) private void ShowQueueBtn_Click(object sender, RoutedEventArgs e) { - if(DownloadQueuePanel.Visibility == Visibility.Visible) + if (DownloadQueuePanel.Visibility == Visibility.Visible) { DownloadQueuePanel.Visibility = Visibility.Hidden; return; @@ -228,7 +229,7 @@ private void DownloadQueueGrid_MouseLeftButtonDown(object sender, MouseButtonEve private void ShowSettingsBtn_Click(object sender, RoutedEventArgs e) { - if(SettingsBox.Visibility == Visibility.Visible) + if (SettingsBox.Visibility == Visibility.Visible) { SettingsBox.Visibility = Visibility.Hidden; return; @@ -271,7 +272,7 @@ public static void CopyDirectory(string sourcePath, string destinationPath) { System.IO.File.Copy(fsi.FullName, destName, true); System.IO.File.Delete(fsi.FullName); - } + } else { System.IO.Directory.CreateDirectory(destName); @@ -307,7 +308,7 @@ private void UpdatePromptBox_Confirmed(bool IsUpdate) private void ShowFavoritesBtn_Click(object sender, RoutedEventArgs e) { - if(FavListBox.Visibility == Visibility.Visible) + if (FavListBox.Visibility == Visibility.Visible) { FavListBox.Visibility = Visibility.Hidden; return; diff --git a/Bili-dl/Bili-dl/Properties/AssemblyInfo.cs b/Bili-dl/Bili-dl/Properties/AssemblyInfo.cs index 91c4df4..7378315 100644 --- a/Bili-dl/Bili-dl/Properties/AssemblyInfo.cs +++ b/Bili-dl/Bili-dl/Properties/AssemblyInfo.cs @@ -1,6 +1,4 @@ using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; diff --git a/Bili-dl/Bili-dl/SettingPanel.xaml.cs b/Bili-dl/Bili-dl/SettingPanel.xaml.cs index fabe003..f34ce7e 100644 --- a/Bili-dl/Bili-dl/SettingPanel.xaml.cs +++ b/Bili-dl/Bili-dl/SettingPanel.xaml.cs @@ -33,7 +33,7 @@ public Settings() DownloadThreads = 5; } } - + // Settings instance. public static Settings settings; diff --git a/Bili-dl/Bili-dl/UpdatePrompt.xaml.cs b/Bili-dl/Bili-dl/UpdatePrompt.xaml.cs index 552fc76..8174ce5 100644 --- a/Bili-dl/Bili-dl/UpdatePrompt.xaml.cs +++ b/Bili-dl/Bili-dl/UpdatePrompt.xaml.cs @@ -4,7 +4,6 @@ using System.Net; using System.Reflection; using System.Threading; -using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; diff --git a/Bili-dl/Bili-dl/WpfAnimatedGif/Decoding/GifPlainTextExtension.cs b/Bili-dl/Bili-dl/WpfAnimatedGif/Decoding/GifPlainTextExtension.cs index 36f6b7b..458f759 100644 --- a/Bili-dl/Bili-dl/WpfAnimatedGif/Decoding/GifPlainTextExtension.cs +++ b/Bili-dl/Bili-dl/WpfAnimatedGif/Decoding/GifPlainTextExtension.cs @@ -45,7 +45,7 @@ private void Read(Stream stream, IEnumerable controlExtensions, bo // Note: at this point, the label (0x01) has already been read byte[] bytes = new byte[13]; - stream.ReadAll(bytes,0, bytes.Length); + stream.ReadAll(bytes, 0, bytes.Length); BlockSize = bytes[0]; if (BlockSize != 12) diff --git a/Bili-dl/Bili-dl/WpfAnimatedGif/ImageAnimationController.cs b/Bili-dl/Bili-dl/WpfAnimatedGif/ImageAnimationController.cs index aeaa7fd..b4ca0ea 100644 --- a/Bili-dl/Bili-dl/WpfAnimatedGif/ImageAnimationController.cs +++ b/Bili-dl/Bili-dl/WpfAnimatedGif/ImageAnimationController.cs @@ -15,7 +15,7 @@ public class ImageAnimationController : IDisposable static ImageAnimationController() { - _sourceDescriptor = DependencyPropertyDescriptor.FromProperty(Image.SourceProperty, typeof (Image)); + _sourceDescriptor = DependencyPropertyDescriptor.FromProperty(Image.SourceProperty, typeof(Image)); } private readonly Image _image; diff --git a/Bili-dl/Bili-dl/WpfAnimatedGif/ImageBehavior.cs b/Bili-dl/Bili-dl/WpfAnimatedGif/ImageBehavior.cs index d5f91f0..f8c0596 100644 --- a/Bili-dl/Bili-dl/WpfAnimatedGif/ImageBehavior.cs +++ b/Bili-dl/Bili-dl/WpfAnimatedGif/ImageBehavior.cs @@ -237,8 +237,8 @@ public static void RemoveAnimationLoadedHandler(Image image, RoutedEventHandler EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, - typeof (RoutedEventHandler), - typeof (ImageBehavior)); + typeof(RoutedEventHandler), + typeof(ImageBehavior)); /// /// Adds a handler for the AnimationCompleted attached event. @@ -370,7 +370,7 @@ private static void AnimateInDesignModeChanged(DependencyObject o, DependencyPro if (imageControl == null) return; - bool newValue = (bool) e.NewValue; + bool newValue = (bool)e.NewValue; ImageSource source = GetAnimatedSource(imageControl); if (source != null && imageControl.IsLoaded) @@ -421,7 +421,7 @@ private static void InitAnimationOrImage(Image imageControl) if (animation.KeyFrames.Count > 0) { // For some reason, it sometimes throws an exception the first time... the second time it works. - TryTwice(() => imageControl.Source = (ImageSource) animation.KeyFrames[0].Value); + TryTwice(() => imageControl.Source = (ImageSource)animation.KeyFrames[0].Value); } else { @@ -782,16 +782,16 @@ private static FrameMetadata GetFrameMetadata(BitmapFrame frame) var metadataDelay = metadata.GetQueryOrDefault("/grctlext/Delay", 10); if (metadataDelay != 0) delay = TimeSpan.FromMilliseconds(metadataDelay * 10); - var disposalMethod = (FrameDisposalMethod) metadata.GetQueryOrDefault("/grctlext/Disposal", 0); + var disposalMethod = (FrameDisposalMethod)metadata.GetQueryOrDefault("/grctlext/Disposal", 0); var frameMetadata = new FrameMetadata - { - Left = metadata.GetQueryOrDefault("/imgdesc/Left", 0), - Top = metadata.GetQueryOrDefault("/imgdesc/Top", 0), - Width = metadata.GetQueryOrDefault("/imgdesc/Width", frame.PixelWidth), - Height = metadata.GetQueryOrDefault("/imgdesc/Height", frame.PixelHeight), - Delay = delay, - DisposalMethod = disposalMethod - }; + { + Left = metadata.GetQueryOrDefault("/imgdesc/Left", 0), + Top = metadata.GetQueryOrDefault("/imgdesc/Top", 0), + Width = metadata.GetQueryOrDefault("/imgdesc/Width", frame.PixelWidth), + Height = metadata.GetQueryOrDefault("/imgdesc/Height", frame.PixelHeight), + Delay = delay, + DisposalMethod = disposalMethod + }; return frameMetadata; } @@ -799,21 +799,21 @@ private static FrameMetadata GetFrameMetadata(GifFrame gifMetadata) { var d = gifMetadata.Descriptor; var frameMetadata = new FrameMetadata - { - Left = d.Left, - Top = d.Top, - Width = d.Width, - Height = d.Height, - Delay = TimeSpan.FromMilliseconds(100), - DisposalMethod = FrameDisposalMethod.None - }; + { + Left = d.Left, + Top = d.Top, + Width = d.Width, + Height = d.Height, + Delay = TimeSpan.FromMilliseconds(100), + DisposalMethod = FrameDisposalMethod.None + }; var gce = gifMetadata.Extensions.OfType().FirstOrDefault(); if (gce != null) { if (gce.Delay != 0) frameMetadata.Delay = TimeSpan.FromMilliseconds(gce.Delay); - frameMetadata.DisposalMethod = (FrameDisposalMethod) gce.DisposalMethod; + frameMetadata.DisposalMethod = (FrameDisposalMethod)gce.DisposalMethod; } return frameMetadata; }