Merge pull request #7 from HughIsaacs2/experimental

Experimental

Author: HughIsaacs2

README.md

@@ -26,6 +26,8 @@ Basically all this does is use the Chrome Extension WebRequest API and Proxy API
 * Firefox support (this is trouble as [the Firefox WebExtension Proxy API](https://developer.mozilla.org/en-US/Add-ons/WebExtensions/API/proxy) is different).
   * Firefox for Android support.
 * Opera support.
+* Mac OS support.
+* Linux support.
 * Chrome OS support.
 * dat:// link support.
   * This'll require coming up with a way to simply parse Dat URLs in a regular web browser, as [parse-dat-url](https://github.com/pfrazee/parse-dat-url "parse-dat-url") doesn't work very well on the web (there's likely a fix that can be done with regular expressions but I suck at them so... yeah).
@@ -44,3 +46,14 @@ Basically all this does is use the Chrome Extension WebRequest API and Proxy API
 * Edge support? (Not possible yet, needs the Proxy API, if it ever gets it)
 * Safari support? (I'm unsure if this is possible)
 * Internet Explorer support? (I'm being ridiculous here, but again unsure if this is possible)
+
+## To-Do [Short term + more specific list]
+* Dat URL for current tab in the extension pop up.
+* Support for 404 pages by reading “fallback_page” in dat.json.
+* An button in the extension pop up to tell the app to download the entire Dat.
+* A button in the extension pop up to tell the app to delete the entire Dat.
+* A landing page for introducing users to the extension/app.
+* A page for deleting torrents/dats and other information.
+* The ability to submit dat links or hashes as searches in the extension (needs Dat parse for web).
+* Grey out extension icon when not on a Dat site.
+

electron app/resources/datpart/launch.js

@@ -15,9 +15,13 @@ var appName = app.getName();
 var appIcon = __dirname+'/logo_128.png';
 var appPath = app.getAppPath();
 
-	if (!fs.existsSync(__dirname + '/../../dats/')) {
-		fs.mkdirSync(__dirname + '/../../dats/');
-	}
+if (fs.existsSync(__dirname + '/../../dev.hta')) {
+	dev = true;
+}
+
+if (!fs.existsSync(__dirname + '/../../dats/')) {
+	fs.mkdirSync(__dirname + '/../../dats/');
+}
 
 function createWindow () {
   // Create the browser window.

electron app/resources/datpart/package.json

@@ -27,6 +27,13 @@
         }
       ],
       "icon": "favicon.ico"
+    },
+    "mac": {
+      "target": "dmg"
+    },
+    "linux": {
+      "target": "AppImage",
+      "category": "Network"
     }
   },
   "devDependencies": {

electron app/resources/datpart/server_script.js

@@ -98,15 +98,15 @@ const requestHandler = (request, response) => {
 	var currentTLD = currentURLRequest.hostname.split(".").pop();
 	var currentURLhostNoTLD = currentURLRequest.hostname.split(".")[0];
 
-	var fileSearch = currentURLRequest.pathname;
+	var datPath = currentURLRequest.pathname;
 
-	console.log(fileSearch);
+	console.log(datPath);
 
 	console.log("TLD: " + currentTLD + " Hash: " + currentURLhostNoTLD);
 	/*
 	if(currentTLD == 'dat_site') {
-		fileSearch = "/dats/" + currentURLhostNoTLD + currentURLRequest.pathname;
-		console.log(fileSearch);
+		datPath = "/dats/" + currentURLhostNoTLD + currentURLRequest.pathname;
+		console.log(datPath);
 	}
 */
   var uri = url.parse(request.url).pathname, 
@@ -122,24 +122,28 @@ if(currentTLD == 'dat_site' && fs.existsSync(__dirname + "/../../dats/")) {
 
 dat( __dirname + '/../../dats/'+currentURLhostNoTLD, {
   // 2. Tell Dat what link I want
-  key: currentURLhostNoTLD, temp: false, sparse: true // (a 64 character hash from above)
+  key: currentURLhostNoTLD, temp: true, sparse: true // (a 64 character hash from above)
 }, function (err, dat) {
   if (err) {throw err;console.log(err)}
 
   var stats = dat.trackStats()
 
   // 3. Join the network & download (files are automatically downloaded)
   dat.joinNetwork();
-  /*
-  dat.archive.readFile(fileSearch+'/dat.json', function (err, content) {
+  
+  var datJSON;
+
+  dat.archive.readFile(datPath+'/dat.json', function (err, content) {
     console.log(JSON.parse(content));
+	datJSON = JSON.parse(content);
+	console.log(datJSON["fallback_page"]);
 	if (err) {throw err;console.log(err)}
   });
-  */
+
   var lastChar = request.url.substr(-1); // Selects the last character
 if (lastChar == '/') {         // If the last character is not a slash
 
-  dat.archive.readFile(fileSearch+'/index.html', function (err, content) {
+  dat.archive.readFile(datPath+'/index.html', function (err, content) {
     console.log(content);
 	response.writeHead(200, { "Content-Type": "text/html" });
 	response.end(content);
@@ -148,11 +152,13 @@ if (lastChar == '/') {         // If the last character is not a slash
 
 } else {
 
-  dat.archive.readFile(fileSearch, function (err, content) {
+  dat.archive.readFile(datPath, function (err, content) {
     console.log(content);
 	response.writeHead(200, { "Content-Type": mimeType });
 	response.end(content);
-	if (err) {throw err;console.log(err)}
+	if (err) {
+		throw err;console.log(err)
+		}
   });
 
 }
@@ -169,9 +175,9 @@ console.log(request.url);
 	var currentTLD = currentURLRequest.hostname.split(".").pop();
 	var currentURLhostNoTLD = currentURLRequest.hostname.split(".")[0];
 
-	var fileSearch = currentURLRequest.pathname;
+	var datPath = currentURLRequest.pathname;
 
-	console.log(fileSearch);
+	console.log(datPath);
 
 	console.log("TLD: " + currentTLD + " Hash: " + currentURLhostNoTLD);