DCO/xerobrowser
Archived
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

fix / suppress all remaining errors

Browse source
This commit is contained in:
RandomHuman 2023-02-20 04:39:19 -07:00
parent 35337cf3ea
commit 0bd7c40af2
9 changed files with 333 additions and 9200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
WebBrowser/DisplayHandler.cs
View file

@ -14,13 +14,13 @@ namespace XeroBrowser
{ {
public class DisplayHandler : IDisplayHandler public class DisplayHandler : IDisplayHandler
{ {
private readonly FrmBrowser _frmref;
public FrmBrowser Frmref;
public DisplayHandler(FrmBrowser frm) public DisplayHandler(FrmBrowser frm)
{ {
Frmref = frm; _frmref = frm;
} }
public static Icon BytesToIcon(byte[] bytes)
private static Icon BytesToIcon(byte[] bytes)
{ {
using (MemoryStream ms = new MemoryStream(bytes)) using (MemoryStream ms = new MemoryStream(bytes))
{ {
@ -54,10 +54,10 @@ namespace XeroBrowser
{ {
WebClient wc = new WebClient(); WebClient wc = new WebClient();
byte[] buffer = wc.DownloadData(urls[0]); byte[] buffer = wc.DownloadData(urls[0]);
Frmref.Icon = BytesToIcon(buffer); _frmref.Icon = BytesToIcon(buffer);
Frmref.Update(); _frmref.Update();
Frmref.ParentTabs.UpdateThumbnailPreviewIcon(Frmref.ParentTabs.Tabs.Single(t => t.Content == Frmref)); _frmref.ParentTabs.UpdateThumbnailPreviewIcon(_frmref.ParentTabs.Tabs.Single(t => t.Content == _frmref));
Frmref.ParentTabs.RedrawTabs(); _frmref.ParentTabs.RedrawTabs();
} }
@ -67,17 +67,17 @@ namespace XeroBrowser
WebClient wc = new WebClient(); WebClient wc = new WebClient();
Uri furi = new Uri(chromiumWebBrowser.Address); Uri furi = new Uri(chromiumWebBrowser.Address);
byte[] buffer = wc.DownloadData(furi.GetLeftPart(UriPartial.Authority) +"/favicon.ico"); byte[] buffer = wc.DownloadData(furi.GetLeftPart(UriPartial.Authority) +"/favicon.ico");
Frmref.Icon = BytesToIcon(buffer); _frmref.Icon = BytesToIcon(buffer);
Frmref.Update(); _frmref.Update();
Frmref.ParentTabs.UpdateThumbnailPreviewIcon(Frmref.ParentTabs.Tabs.Single(t => t.Content == Frmref)); _frmref.ParentTabs.UpdateThumbnailPreviewIcon(_frmref.ParentTabs.Tabs.Single(t => t.Content == _frmref));
Frmref.ParentTabs.RedrawTabs(); _frmref.ParentTabs.RedrawTabs();
} }
catch (Exception){ catch (Exception){
ComponentResourceManager resources = new ComponentResourceManager(typeof(FrmBrowser)); ComponentResourceManager resources = new ComponentResourceManager(typeof(FrmBrowser));
Frmref.Icon = ((Icon)(resources.GetObject("$this.Icon"))); _frmref.Icon = ((Icon)(resources.GetObject("$this.Icon")));
Frmref.Update(); _frmref.Update();
Frmref.ParentTabs.UpdateThumbnailPreviewIcon(Frmref.ParentTabs.Tabs.Single(t => t.Content == Frmref)); _frmref.ParentTabs.UpdateThumbnailPreviewIcon(_frmref.ParentTabs.Tabs.Single(t => t.Content == _frmref));
Frmref.ParentTabs.RedrawTabs(); _frmref.ParentTabs.RedrawTabs();
} }
} }
} }

41
WebBrowser/DownloadHandler.cs
View file

@ -8,6 +8,7 @@ using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using CefSharp; using CefSharp;
using Timer = System.Threading.Timer; using Timer = System.Threading.Timer;
// ReSharper disable NotAccessedField.Local
namespace XeroBrowser namespace XeroBrowser
{ {
@ -17,26 +18,26 @@ namespace XeroBrowser
public event EventHandler<DownloadItem> OnDownloadUpdatedFired; public event EventHandler<DownloadItem> OnDownloadUpdatedFired;
public FrmBrowser Frmref; private readonly FrmBrowser _frmref;
public DownloadHandler(FrmBrowser frm) public DownloadHandler(FrmBrowser frm)
{ {
Frmref = frm; _frmref = frm;
} }
public DownloadProgress DownloadProgress = new DownloadProgress(); private readonly DownloadProgress _downloadProgress = new DownloadProgress();
public DownloadItem DownloadItem; private DownloadItem _downloadItem;
public void OnBeforeDownload(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback) public void OnBeforeDownload(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IBeforeDownloadCallback callback)
{ {
OnBeforeDownloadFired?.Invoke(this, downloadItem); OnBeforeDownloadFired?.Invoke(this, downloadItem);
this.DownloadItem = downloadItem; this._downloadItem = downloadItem;
try try
{ {
Frmref.Invoke((Action)delegate _frmref.Invoke((Action)delegate
{ {
DownloadProgress.Show(); _downloadProgress.Show();
DownloadProgress.FormClosing += DownloadProgress_FormClosing; _downloadProgress.FormClosing += DownloadProgress_FormClosing;
}); });
} }
catch (ObjectDisposedException){} catch (ObjectDisposedException){}
@ -53,10 +54,10 @@ namespace XeroBrowser
private void DownloadProgress_FormClosing(object sender, FormClosingEventArgs e) private void DownloadProgress_FormClosing(object sender, FormClosingEventArgs e)
{ {
DownloadItem.IsCancelled = true; _downloadItem.IsCancelled = true;
} }
public Timer Fivesecondtimer; private Timer _fivesecondtimer;
public void OnDownloadUpdated(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback) public void OnDownloadUpdated(IWebBrowser chromiumWebBrowser, IBrowser browser, DownloadItem downloadItem, IDownloadItemCallback callback)
{ {
OnDownloadUpdatedFired?.Invoke(this, downloadItem); OnDownloadUpdatedFired?.Invoke(this, downloadItem);
@ -64,15 +65,15 @@ namespace XeroBrowser
if (downloadItem.IsComplete) if (downloadItem.IsComplete)
{ {
Fivesecondtimer = new Timer(tcallback, null, 1000 * 5, 1000 * 5); _fivesecondtimer = new Timer(tcallback, null, 1000 * 5, 1000 * 5);
} }
Frmref.Invoke((Action)delegate { _frmref.Invoke((Action)delegate {
DownloadProgress.ProgressBar1.Value = downloadItem.PercentComplete; _downloadProgress.ProgressBar1.Value = downloadItem.PercentComplete;
DownloadProgress.ProgressPrecentage.Text = downloadItem.PercentComplete + @"% " + (downloadItem.ReceivedBytes / 0x100000) + @"MB / " + (downloadItem.TotalBytes / 0x100000) + @"MB"; _downloadProgress.ProgressPrecentage.Text = downloadItem.PercentComplete + @"% " + (downloadItem.ReceivedBytes / 0x100000) + @"MB / " + (downloadItem.TotalBytes / 0x100000) + @"MB";
DownloadProgress.ProgressFileName.Text = Path.GetFileName(downloadItem.FullPath); _downloadProgress.ProgressFileName.Text = Path.GetFileName(downloadItem.FullPath);
DownloadProgress.Update(); _downloadProgress.Update();
try { } catch (InvalidAsynchronousStateException){} try { } catch (InvalidAsynchronousStateException){}
}); });
} }
@ -80,12 +81,12 @@ namespace XeroBrowser
private void tcallback(object state) private void tcallback(object state)
{ {
try { try {
Frmref.Invoke((Action)delegate _frmref.Invoke((Action)delegate
{ {
DownloadProgress.Close(); _downloadProgress.Close();
}); });
} }
catch (InvalidOperationException){} catch (InvalidOperationException){}
} }
} }
} }

8
WebBrowser/Program.cs
View file

@ -11,7 +11,7 @@ namespace XeroBrowser
{ {
public static AppContainer Container; public static AppContainer Container;
public static TitleBarTabsApplicationContext ApplicationContext; private static TitleBarTabsApplicationContext _applicationContext;
/// <summary> /// <summary>
/// The main entry point for the application. /// The main entry point for the application.
/// </summary> /// </summary>
@ -52,9 +52,9 @@ namespace XeroBrowser
Container.SelectedTabIndex = 0; Container.SelectedTabIndex = 0;
try { try {
ApplicationContext = new TitleBarTabsApplicationContext(); _applicationContext = new TitleBarTabsApplicationContext();
ApplicationContext.Start(Container); _applicationContext.Start(Container);
Application.Run(ApplicationContext); Application.Run(_applicationContext);
} }
catch (Exception) catch (Exception)
{ {

45
WebBrowser/frmBrowser.cs
View file

@ -6,12 +6,13 @@ using Bunifu.Utils;
using CefSharp; using CefSharp;
using EasyTabs; using EasyTabs;
using XeroBrowser.Properties; using XeroBrowser.Properties;
// ReSharper disable PossibleNullReferenceException
namespace XeroBrowser namespace XeroBrowser
{ {
public partial class FrmBrowser : Form public partial class FrmBrowser : Form
{ {
Uri _fileUri; private readonly Uri _fileUri;
// Uri _fileUri2; // Uri _fileUri2;
public FrmBrowser() public FrmBrowser()
{ {
@ -29,14 +30,9 @@ namespace XeroBrowser
} }
public TitleBarTabs ParentTabs public TitleBarTabs ParentTabs => (ParentForm as TitleBarTabs);
{
get private void btnForward_Click(object sender, EventArgs e)
{
return (ParentForm as TitleBarTabs);
}
}
private void btnForward_Click(object sender, EventArgs e)
{ {
if (chromiumWebBrowser1.CanGoForward) chromiumWebBrowser1.Forward(); if (chromiumWebBrowser1.CanGoForward) chromiumWebBrowser1.Forward();
@ -78,14 +74,7 @@ namespace XeroBrowser
{ {
if (txtSearchOrUrl != null && chromiumWebBrowser1 != null) if (txtSearchOrUrl != null && chromiumWebBrowser1 != null)
{ {
if (!chromiumWebBrowser1.Address.EndsWith(_fileUri.ToString())) txtSearchOrUrl.Text = !chromiumWebBrowser1.Address.EndsWith(_fileUri.ToString()) ? chromiumWebBrowser1.Address : "";
{
txtSearchOrUrl.Text = chromiumWebBrowser1.Address;
}
else
{
txtSearchOrUrl.Text = "";
}
} }
}); });
@ -113,17 +102,17 @@ namespace XeroBrowser
} }
// if (txtSearchOrUrl.Text.Contains("netflix.com")) // if (txtSearchOrUrl.Text.Contains("netflix.com"))
// { // {
//MessageBox.Show("This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.", "Xero Browser", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning); //MessageBox.Show("This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.", "Xero Browser", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
// chromiumWebBrowser1.Stop(); // cancel the navigation // chromiumWebBrowser1.Stop(); // cancel the navigation
// isBlocked = true; // isBlocked = true;
// chromiumWebBrowser1.LoadHtml("<html><body><h1>Error!</h1><h3>This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.</h3></body></html>"); // chromiumWebBrowser1.LoadHtml("<html><body><h1>Error!</h1><h3>This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.</h3></body></html>");
// } // }
// else if (txtSearchOrUrl.Text.Contains("disneyplus.com")) // else if (txtSearchOrUrl.Text.Contains("disneyplus.com"))
// { // {
// MessageBox.Show("This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.", "Xero Browser", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning); // MessageBox.Show("This site requires a DRM (Digital Rights Management) which Xero Browser does not support! TV Shows & Moves will not load.", "Xero Browser", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning);
// } // }
if (e.IsLoading) if (e.IsLoading)
{ {

4689
WebBrowser/index.html
View file

File diff suppressed because one or more lines are too long

4673
WebBrowser/loaderror.html
View file

File diff suppressed because one or more lines are too long

9
WebBrowser/script.js
View file

@ -1,10 +1,5 @@
/*! // noinspection InfiniteRecursionJS,JSPotentiallyInvalidConstructorUsage,JSUnusedGlobalSymbols,RegExpRedundantEscape,JSPotentiallyInvalidUsageOfThis,ExceptionCaughtLocallyJS,JSReferencingMutableVariableFromClosure,HtmlRequiredAltAttribute,JSAssignmentUsedAsCondition,FallThroughInSwitchStatementJS,JSSwitchVariableDeclarationIssue,StatementWithEmptyBodyJS,JSSuspiciousNameCombination,UnreachableCodeJS,ThrowInsideFinallyBlockJS,JSVoidFunctionReturnValueUsed,ES6ConvertVarToLetConst,JSDeprecatedSymbols,JSCheckFunctionSignatures,JSValidateTypes,JSUnresolvedFunction,BadExpressionStatementJS
* Webflow: Front-end site library
* @license MIT
* Inline scripts may access the api using an async handler:
* var Webflow = Webflow || [];
* Webflow.push(readyFunction);
*/
! function(t) { ! function(t) {
var e = {}; var e = {};

22
WebBrowser/style.css
View file

File diff suppressed because one or more lines are too long

14
XeroBrowser.sln.DotSettings Normal file
View file

@ -0,0 +1,14 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:Boolean x:Key="/Default/UserDictionary/Words/=bunifu/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=cpprestsdk/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=disneyplus/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Drms/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=fivesecondtimer/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=frmref/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=furi/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=KHTML/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=loaderror/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Rickroll/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=rickrolled/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=sourceid/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=tcallback/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>