Combined the fields "downloadImage" and "downloadDocument" into " downloadFile" (#62)

Author: GooDRomka

package.json

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

src/_locales/en/messages.json

@@ -70,8 +70,7 @@
 	"selector_edit_discardInitialElements": {
 		"message": "Discard initial elements that are available before click"
 	},
-	"selector_edit_download_image": { "message": "Download image" },
-	"selector_edit_download_document": { "message": "Download document" },
+	"selector_edit_download_file": { "message": "Download as file" },
 	"selector_edit_attribute_name": { "message": "Attribute name" },
 	"selector_edit_value": { "message": "Value" },
 	"selector_edit_style_name": { "message": "Style name" },

src/_locales/ru/messages.json

@@ -70,8 +70,7 @@
 	"selector_edit_discardInitialElements": {
 		"message": "Отменить начальные элементы, которые доступны до нажатия"
 	},
-	"selector_edit_download_image": { "message": "Сохранить картинку" },
-	"selector_edit_download_document": { "message": "Сохранить документ" },
+	"selector_edit_download_file": { "message": "Сохранить в файл" },
 	"selector_edit_attribute_name": { "message": "Имя атрибута" },
 	"selector_edit_value": { "message": "Значение" },
 	"selector_edit_style_name": { "message": "Имя стиля" },

src/devtools/views/SelectorEdit.html

@@ -313,35 +313,18 @@
 		</div>
 	</div>
 
-	<!-- downloadImage -->
-	<div class="form-group feature feature-downloadImage">
+	<!-- downloadFile -->
+	<div class="form-group feature feature-downloadFile">
 		<label
-			for="downloadImage"
+			for="downloadFile"
 			class="col-sm-2 control-label"
-			data-i18n="selector_edit_download_image"
+			data-i18n="selector_edit_download_File"
 		></label>
 		<div class="col-sm-8">
 			<div class="checkbox">
 				<label>
-					<input type="checkbox" id="downloadImage" name="downloadImage"
-					{{#selector.downloadImage}} checked="checked" {{/selector.downloadImage}} />
-				</label>
-			</div>
-		</div>
-	</div>
-	<!-- downloadDocument-->
-	<div class="form-group feature feature-downloadDocument">
-		<label
-			for="downloadDocument"
-			class="col-sm-2 control-label"
-			data-i18n="selector_edit_download_document"
-		></label>
-		<div class="col-sm-8">
-			<div class="checkbox">
-				<label>
-					<input type="checkbox" id="downloadDocument" name="downloadDocument"
-					{{#selector.downloadDocument}} checked="checked" {{/selector.downloadDocument}}
-					/>
+					<input type="checkbox" id="downloadFile" name="downloadFile"
+					{{#selector.downloadFile}} checked="checked" {{/selector.downloadFile}} />
 				</label>
 			</div>
 		</div>

src/scripts/Controller.js

@@ -1106,8 +1106,7 @@ export default class SitemapController {
 			':checked'
 		);
 		const multiple = $('#edit-selector [name=multiple]').is(':checked');
-		const downloadImage = $('#edit-selector [name=downloadImage]').is(':checked');
-		const downloadDocument = $('#edit-selector [name=downloadDocument]').is(':checked');
+		const downloadFile = $('#edit-selector [name=downloadFile]').is(':checked');
 		const clickPopup = $('#edit-selector [name=clickPopup]').is(':checked');
 		const delay = $('#edit-selector [name=delay]').val();
 		const extractAttribute = $('#edit-selector [name=extractAttribute]').val();
@@ -1158,8 +1157,7 @@ export default class SitemapController {
 			discardInitialElements,
 			type,
 			multiple,
-			downloadImage,
-			downloadDocument,
+			downloadFile,
 			clickPopup,
 			extractAttribute,
 			extractStyle,

src/scripts/Selector/SelectorDocument.js

@@ -27,7 +27,7 @@ export default class SelectorDocument extends Selector {
 	}
 
 	downloadsAttachments() {
-		return !!this.downloadDocument;
+		return !!this.downloadFile;
 	}
 
 	async _getData(parentElement) {
@@ -43,7 +43,7 @@ export default class SelectorDocument extends Selector {
 			result[`${this.id}-href`] = urls.length ? urls[0] : null;
 		}
 
-		if (this.downloadDocument) {
+		if (this.downloadFile) {
 			const documents = [];
 			for (const [i, url] of urls.entries()) {
 				try {
@@ -70,7 +70,7 @@ export default class SelectorDocument extends Selector {
 
 	getDataColumns() {
 		const dataColumns = [`${this.id}-href`];
-		if (this.downloadDocument) {
+		if (this.downloadFile) {
 			dataColumns.push(`${this.id}-path`, `${this.id}-checksum`, `${this.id}-filename`);
 		}
 		return dataColumns;
@@ -81,7 +81,7 @@ export default class SelectorDocument extends Selector {
 	}
 
 	getFeatures() {
-		return ['selector', 'multiple', 'delay', 'downloadDocument', 'stringReplacement'];
+		return ['selector', 'multiple', 'delay', 'downloadFile', 'stringReplacement'];
 	}
 
 	getItemCSSSelector() {

src/scripts/Selector/SelectorImage.js

@@ -28,7 +28,7 @@ export default class SelectorImage extends Selector {
 	}
 
 	downloadsAttachments() {
-		return !!this.downloadImage;
+		return !!this.downloadFile;
 	}
 
 	async _getData(parentElement) {
@@ -51,7 +51,7 @@ export default class SelectorImage extends Selector {
 			result[`${this.id}-src`] = urls.length ? urls[0] : null;
 		}
 
-		if (this.downloadImage) {
+		if (this.downloadFile) {
 			const images = [];
 			for (const [i, url] of urls.entries()) {
 				try {
@@ -87,7 +87,7 @@ export default class SelectorImage extends Selector {
 	}
 
 	getFeatures() {
-		return ['selector', 'multiple', 'delay', 'downloadImage', 'stringReplacement'];
+		return ['selector', 'multiple', 'delay', 'downloadFile', 'stringReplacement'];
 	}
 
 	getItemCSSSelector() {