Skip to content

Commit

Permalink
fix download manager and upgrade nuget format
Browse files Browse the repository at this point in the history
  • Loading branch information
robinrodricks committed Feb 27, 2020
1 parent 14253d5 commit 51adcb8
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 38 deletions.
5 changes: 0 additions & 5 deletions src/App.config
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
<?xml version="1.0"?>
<configuration>
<appSettings>
<add key="torConfigurationFile" value=""/>
<add key="torControlPassword" value=""/>
<add key="torControlPort" value="9051"/>
<add key="torDefaultConfigurationFile" value=""/>
<add key="torPath" value="Tor\Tor\tor.exe"/>
</appSettings>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
12 changes: 5 additions & 7 deletions src/Handlers/DownloadHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace SharpBrowser {
internal class DownloadHandler : IDownloadHandler {
MainForm myForm;
readonly MainForm myForm;

public DownloadHandler(MainForm form) {
myForm = form;
Expand All @@ -18,19 +18,17 @@ public void OnBeforeDownload(IWebBrowser webBrowser, IBrowser browser, DownloadI
string path = myForm.CalcDownloadPath(item);

// if file should not be saved, path will be null, so skip file
if (path != null) {
if (path == null) {

// skip file
callback.Continue(path, false);

} else {

// download file
callback.Dispose();
}
else {

// open the downloads tab
myForm.OpenDownloadsTab();

callback.Continue(path, true);
}

}
Expand Down
1 change: 0 additions & 1 deletion src/Handlers/HostHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public void addNewBrowserTab(string url, bool focusNewTab = true) {
public string getDownloads() {
lock (myForm.downloads) {
string x = JSON.Instance.ToJSON(myForm.downloads);
//MessageBox.Show(x);
return x;
}
}
Expand Down
10 changes: 8 additions & 2 deletions src/Handlers/ResourceRequestHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

namespace SharpBrowser {
internal class ResourceRequestHandler : IResourceRequestHandler {
MainForm myForm;
readonly MainForm myForm;
public ResourceRequestHandler(MainForm form) {
myForm = form;
}
Expand Down Expand Up @@ -125,7 +125,7 @@ public CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrow
if (tab != null && tab.RefererURL != null) {

// Set referer
request.SetReferrer(tab.RefererURL, ReferrerPolicy.Always);
request.SetReferrer(tab.RefererURL, ReferrerPolicy.Default);

}

Expand Down Expand Up @@ -193,6 +193,12 @@ public void OnResourceLoadComplete(IWebBrowser chromiumWebBrowser, IBrowser brow
int code = response.StatusCode;


// exit if frame is invalid (if the frame has closed, for example)
if (!frame.IsValid) {
return;
}


// if NOT FOUND
if (code == 404) {

Expand Down
28 changes: 12 additions & 16 deletions src/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ internal partial class MainForm : Form {
public static MainForm Instance;

public static string Branding = "SharpBrowser";
public static string UserAgent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.120 Safari/537.36";
public static string UserAgent = "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.130 Safari/537.36";
public static string AcceptLanguage = "en-US,en;q=0.9";
public static string HomepageURL = "https://www.google.com";
public static string NewTabURL = "about:blank";
public static string InternalURL = "sharpbrowser";
public static string DownloadsURL = "sharpbrowser://storage/downloads.html";
public static string FileNotFoundURL = "sharpbrowser://storage/errors/notFound.html";
public static string CannotConnectURL = "sharpbrowser://storage/errors/cannotConnect.html";
Expand Down Expand Up @@ -155,15 +157,17 @@ public void InitTooltips(System.Windows.Forms.Control.ControlCollection parent)
private void InitBrowser() {

CefSharpSettings.LegacyJavascriptBindingEnabled = true;
CefSharpSettings.WcfEnabled = false;

CefSettings settings = new CefSettings();

settings.RegisterScheme(new CefCustomScheme {
SchemeName = "sharpbrowser",
SchemeName = InternalURL,
SchemeHandlerFactory = new SchemeHandlerFactory()
});

settings.UserAgent = UserAgent;
settings.AcceptLanguageList = AcceptLanguage;

settings.IgnoreCertificateErrors = true;

Expand Down Expand Up @@ -233,11 +237,11 @@ private void LoadURL(string url) {

Uri.TryCreate(url, UriKind.Absolute, out outUri);

if (!(urlLower.StartsWith("http") || urlLower.StartsWith("sharpbrowser"))) {
if (!(urlLower.StartsWith("http") || urlLower.StartsWith(InternalURL))) {
if (outUri == null || outUri.Scheme != Uri.UriSchemeFile) newUrl = "http://" + url;
}

if (urlLower.StartsWith("sharpbrowser:") ||
if (urlLower.StartsWith(InternalURL + ":") ||

// load URL if it seems valid
(Uri.TryCreate(newUrl, UriKind.Absolute, out outUri)
Expand Down Expand Up @@ -306,7 +310,7 @@ private bool IsBlank(string url) {
return (url == "" || url == "about:blank");
}
private bool IsBlankOrSystem(string url) {
return (url == "" || url.BeginsWith("about:") || url.BeginsWith("chrome:") || url.BeginsWith("sharpbrowser:"));
return (url == "" || url.BeginsWith("about:") || url.BeginsWith("chrome:") || url.BeginsWith(InternalURL + ":"));
}

public void AddBlankWindow() {
Expand Down Expand Up @@ -392,8 +396,8 @@ private SharpTab AddNewBrowser(FATabStripItem tabStrip, String url) {
// save tab obj in tabstrip
tabStrip.Tag = tab;

if (url.StartsWith("sharpbrowser:")) {
browser.RegisterAsyncJsObject("host", host);
if (url.StartsWith(InternalURL + ":")) {
browser.JavascriptObjectRepository.Register("host", host, true, BindingOptions.DefaultBinder);
}
return tab;
}
Expand Down Expand Up @@ -824,15 +828,7 @@ public void UpdateDownloadItem(DownloadItem item) {
}

public string CalcDownloadPath(DownloadItem item) {

string itemName = item.SuggestedFileName != null ? item.SuggestedFileName.GetAfterLast(".") + " file" : "downloads";

string path = null;
if (path != null) {
return path;
}

return null;
return item.SuggestedFileName;
}

public bool DownloadsInProgress() {
Expand Down
7 changes: 0 additions & 7 deletions src/packages.config

This file was deleted.

0 comments on commit 51adcb8

Please sign in to comment.