From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 2 Mar 2024 10:11:09 +0000 (+0000)
Subject: importer: Create a new subcommand to import feeds
X-Git-Tag: 0.9.18~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93aad7f786f1f2cd66beb592136cf7f3e96eac97;p=location%2Flibloc.git

importer: Create a new subcommand to import feeds

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/scripts/location-importer.in b/src/scripts/location-importer.in
index 296058c..f4a93ee 100644
--- a/src/scripts/location-importer.in
+++ b/src/scripts/location-importer.in
@@ -104,6 +104,11 @@ class CLI(object):
 			help=_("Update Geofeeds"))
 		update_geofeeds.set_defaults(func=self.handle_update_geofeeds)
 
+		# Update feeds
+		update_feeds = subparsers.add_parser("update-feeds",
+			help=_("Update Feeds"))
+		update_feeds.set_defaults(func=self.handle_update_feeds)
+
 		# Update overrides
 		update_overrides = subparsers.add_parser("update-overrides",
 			help=_("Update overrides"),
@@ -1707,13 +1712,6 @@ class CLI(object):
 				DELETE FROM network_overrides WHERE source = 'manual';
 			""")
 
-			# Update overrides for various cloud providers big enough to publish their own IP
-			# network allocation lists in a machine-readable format...
-			self._update_overrides_for_aws()
-
-			# Update overrides for Spamhaus DROP feeds...
-			self._update_feed_for_spamhaus_drop()
-
 			for file in ns.files:
 				log.info("Reading %s..." % file)
 
@@ -1789,7 +1787,17 @@ class CLI(object):
 						else:
 							log.warning("Unsupported type: %s" % type)
 
-	def _update_overrides_for_aws(self):
+	def handle_update_feeds(self, ns):
+		"""
+			Update any third-party feeds
+		"""
+		# AWS
+		self._update_feed_for_aws()
+
+		# Spamhaus
+		self._update_feed_for_spamhaus_drop()
+
+	def _update_feed_for_aws(self):
 		# Download Amazon AWS IP allocation file to create overrides...
 		downloader = location.importer.Downloader()