parse download as JSON
Since filters are supposed to be in JSON
This commit is contained in:
		
							parent
							
								
									912a36a2f6
								
							
						
					
					
						commit
						fe41352afd
					
				
					 1 changed files with 118 additions and 119 deletions
				
			
		|  | @ -4,16 +4,16 @@ Manage filters. | |||
| 
 | ||||
| export default class filters { | ||||
|   constructor() { | ||||
| 		this.all = (async() => { | ||||
|     this.all = async () => { | ||||
|       // Import the updater.
 | ||||
|       const secretariat = await import( | ||||
|         chrome.runtime.getURL("scripts/secretariat.js") | ||||
|       ); | ||||
| 
 | ||||
| 			return(secretariat.read(`filters`, -1).then((filters) => { | ||||
| 				return(filters) | ||||
| 			})); | ||||
| 		}) | ||||
|       return secretariat.read(`filters`, -1).then((filters) => { | ||||
|         return filters; | ||||
|       }); | ||||
|     }; | ||||
|   } | ||||
| 
 | ||||
|   /* Select the most appropriate filter based on a URL. | ||||
|  | @ -28,13 +28,16 @@ export default class filters { | |||
|       ); | ||||
| 
 | ||||
|       // Get the filters.
 | ||||
| 			let filter = (await secretariat.read(`filters`, -1, {"field": "URL", "test value": URL})); | ||||
|       let filter = await secretariat.read(`filters`, -1, { | ||||
|         field: "URL", | ||||
|         "test value": URL, | ||||
|       }); | ||||
| 
 | ||||
|       // If there are filters, then filter the URL.
 | ||||
| 			return (filter); | ||||
|       return filter; | ||||
|     })(); | ||||
| 
 | ||||
| 		return (this.one); | ||||
|     return this.one; | ||||
|   } | ||||
| 
 | ||||
|   /* Update all filters or just one. | ||||
|  | @ -101,13 +104,11 @@ export default class filters { | |||
| 
 | ||||
|         // Inform the user of download state.
 | ||||
|         alerts.log( | ||||
| 					texts.localized(`settings_filters_update_status`, null, [ | ||||
| 						filter_URL, | ||||
| 					]), | ||||
|           texts.localized(`settings_filters_update_status`, null, [filter_URL]), | ||||
|         ); | ||||
| 
 | ||||
|         // Create promise of downloading.
 | ||||
| 				let filter_download = net.download(filter_URL); | ||||
|         let filter_download = net.download(filter_URL, `JSON`); | ||||
|         filter_download | ||||
|           .then((result) => { | ||||
|             // Only work when the filter is valid.
 | ||||
|  | @ -122,16 +123,14 @@ export default class filters { | |||
|                 ), | ||||
|               ); | ||||
|             } | ||||
| 						 | ||||
|           }) | ||||
|           .catch((error) => { | ||||
|             // Inform the user of the download failure.
 | ||||
|             alerts.error( | ||||
| 							texts.localized( | ||||
| 								`settings_filters_update_status_failure`, | ||||
| 								null, | ||||
| 								[error, filter_URL], | ||||
| 							), | ||||
|               texts.localized(`settings_filters_update_status_failure`, null, [ | ||||
|                 error, | ||||
|                 filter_URL, | ||||
|               ]), | ||||
|             ); | ||||
|           }); | ||||
|       } | ||||
|  | @ -141,8 +140,8 @@ export default class filters { | |||
|     } | ||||
| 
 | ||||
|     // Regardless of the download result, update will also mean setting the filters object to whatever is in storage.
 | ||||
| 		this.all = (await secretariat.read(`filters`, -1));	 | ||||
|     this.all = await secretariat.read(`filters`, -1); | ||||
| 
 | ||||
| 		return(this.all); | ||||
|     return this.all; | ||||
|   } | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue