SelectorPageURL (#61)

* Added SelectorPageURL which can extract current Page Url

* Fixed some mistakes

* Updated version

* Fixed code style

Co-authored-by: Alexander <[email protected]>

Author: GooDRomka

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "web-scraper-chrome-extension",
-	"version": "0.3.614",
+	"version": "0.3.615",
 	"description": "Web data extraction tool implemented as chrome extension",
 	"scripts": {
 		"lint": "eslint --ext .js src",

src/_locales/en/messages.json

@@ -136,6 +136,7 @@
 	"SelectorElementScroll": { "message": "Element scroll down" },
 	"SelectorElementClick": { "message": "Element click" },
 	"SelectorGroup": { "message": "Grouped" },
+	"SelectorPageURL": { "message": "Page URL" },
 
 	"sitemap_scrape_config_requestInterval": { "message": "Request interval" },
 	"sitemap_scrape_config_requestIntervalRandomness": { "message": "Request interval randomness" },

src/_locales/ru/messages.json

@@ -142,6 +142,7 @@
 	"SelectorGroup": { "message": "Группа" },
 	"ConstantValue": { "message": "Константа" },
 	"SelectorInputValue": { "message": "Вставка значения" },
+	"SelectorPageURL": { "message": "URL страницы" },
 
 	"sitemap_scrape_requestInterval": { "message": "Интервал между запросами" },
 	"sitemap_scrape_requestIntervalRandomness": { "message": "Случайность между запросами" },

src/scripts/Controller.js

@@ -54,6 +54,9 @@ export default class SitemapController {
 			{
 				type: 'SelectorElementStyle',
 			},
+			{
+				type: 'SelectorPageURL',
+			},
 			{
 				type: 'SelectorHTML',
 			},

src/scripts/Selector/SelectorPageURL.js

@@ -0,0 +1,40 @@
+import Selector from '../Selector';
+
+export default class SelectorPageURL extends Selector {
+	constructor(options) {
+		super(options);
+		this.updateData(options, this.getFeatures());
+	}
+
+	canReturnMultipleRecords() {
+		return false;
+	}
+
+	canHaveChildSelectors() {
+		return false;
+	}
+
+	canHaveLocalChildSelectors() {
+		return false;
+	}
+
+	canCreateNewJobs() {
+		return false;
+	}
+
+	willReturnElements() {
+		return false;
+	}
+
+	async _getData() {
+		return [{ [this.id]: document.location.href }];
+	}
+
+	getDataColumns() {
+		return [this.id];
+	}
+
+	getFeatures() {
+		return ['delay', 'textmanipulation'];
+	}
+}

src/scripts/SelectorList.js

@@ -14,12 +14,15 @@ import SelectorElementClick from './Selector/SelectorElementClick';
 import SelectorElementScroll from './Selector/SelectorElementScroll';
 import SelectorElementAttribute from './Selector/SelectorElementAttribute';
 import SelectorTable from './Selector/SelectorTable';
+import SelectorPageURL from './Selector/SelectorPageURL';
 
 export default class SelectorList extends Array {
 	static createSelector(options) {
 		switch (options.type) {
 			case 'ConstantValue':
 				return new ConstantValue(options);
+			case 'SelectorPageURL':
+				return new SelectorPageURL(options);
 			case 'SelectorDocument':
 				return new SelectorDocument(options);
 			case 'SelectorElement':
@@ -96,9 +99,9 @@ export default class SelectorList extends Array {
 			return this;
 		}
 
-		let getAllChildSelectors = function(parentSelectorId, resultSelectors) {
+		let getAllChildSelectors = function (parentSelectorId, resultSelectors) {
 			this.forEach(
-				function(selector) {
+				function (selector) {
 					if (selector.hasParentSelector(parentSelectorId)) {
 						if (resultSelectors.indexOf(selector) === -1) {
 							resultSelectors.push(selector);
@@ -121,7 +124,7 @@ export default class SelectorList extends Array {
 	 */
 	getDirectChildSelectors(parentSelectorId) {
 		let resultSelectors = new SelectorList();
-		this.forEach(function(selector) {
+		this.forEach(function (selector) {
 			if (selector.hasParentSelector(parentSelectorId)) {
 				resultSelectors.push(selector);
 			}
@@ -131,15 +134,15 @@ export default class SelectorList extends Array {
 
 	clone() {
 		let resultList = new SelectorList();
-		this.forEach(function(selector) {
+		this.forEach(function (selector) {
 			resultList.push(selector);
 		});
 		return resultList;
 	}
 
 	fullClone() {
 		let resultList = new SelectorList();
-		this.forEach(function(selector) {
+		this.forEach(function (selector) {
 			resultList.push(JSON.parse(JSON.stringify(selector)));
 		});
 		return resultList;
@@ -149,7 +152,7 @@ export default class SelectorList extends Array {
 		let resultList = this.clone();
 		for (let i in arguments) {
 			arguments[i].forEach(
-				function(selector) {
+				function (selector) {
 					resultList.push(selector);
 				}.bind(this)
 			);
@@ -178,9 +181,9 @@ export default class SelectorList extends Array {
 		resultList.push(this.getSelector(selectorId));
 
 		// recursively find all parent selectors that could lead to the page where selectorId is used.
-		let findParentSelectors = function(selector) {
+		let findParentSelectors = function (selector) {
 			selector.parentSelectors.forEach(
-				function(parentSelectorId) {
+				function (parentSelectorId) {
 					if (parentSelectorId === '_root') return;
 					let parentSelector = this.getSelector(parentSelectorId);
 					if (resultList.indexOf(parentSelector) !== -1) return;
@@ -205,11 +208,11 @@ export default class SelectorList extends Array {
 	 */
 	getSinglePageAllChildSelectors(parentSelectorId) {
 		let resultList = new SelectorList();
-		let addChildSelectors = function(parentSelector) {
+		let addChildSelectors = function (parentSelector) {
 			if (parentSelector.willReturnElements()) {
 				let childSelectors = this.getDirectChildSelectors(parentSelector.id);
 				childSelectors.forEach(
-					function(childSelector) {
+					function (childSelector) {
 						if (resultList.indexOf(childSelector) === -1) {
 							resultList.push(childSelector);
 							addChildSelectors(childSelector);
@@ -249,7 +252,7 @@ export default class SelectorList extends Array {
 	 */
 	toJSON() {
 		let result = [];
-		this.forEach(function(selector) {
+		this.forEach(function (selector) {
 			result.push(selector);
 		});
 		return result;
@@ -303,10 +306,10 @@ export default class SelectorList extends Array {
 		let RecursionFound = false;
 
 		this.forEach(
-			function(topSelector) {
+			function (topSelector) {
 				let visitedSelectors = [];
 
-				let checkRecursion = function(parentSelector) {
+				let checkRecursion = function (parentSelector) {
 					// already visited
 					if (visitedSelectors.indexOf(parentSelector) !== -1) {
 						RecursionFound = true;