From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 22 Oct 2017 12:00:49 +0000 (+0100)
Subject: web: Rename mirror module
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16f906055f0dd2ee9cc7c5396ee4e381063ba14e;p=people%2Fjschlag%2Fpbs.git

web: Rename mirror module

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

diff --git a/Makefile.am b/Makefile.am
index 8e6fd05..c0786fd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,11 +131,11 @@ web_PYTHON = \
 	src/web/handlers_distro.py \
 	src/web/handlers_jobs.py \
 	src/web/handlers_keys.py \
-	src/web/handlers_mirrors.py \
 	src/web/handlers_packages.py \
 	src/web/handlers_search.py \
 	src/web/handlers_updates.py \
 	src/web/handlers_users.py \
+	src/web/mirrors.py \
 	src/web/ui_modules.py
 
 webdir = $(buildservicedir)/web
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f644886..9ee6590 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -168,11 +168,11 @@ src/web/handlers_builds.py
 src/web/handlers_distro.py
 src/web/handlers_jobs.py
 src/web/handlers_keys.py
-src/web/handlers_mirrors.py
 src/web/handlers_packages.py
 src/web/handlers.py
 src/web/handlers_search.py
 src/web/handlers_updates.py
 src/web/handlers_users.py
 src/web/__init__.py
+src/web/mirrors.py
 src/web/ui_modules.py
diff --git a/src/web/__init__.py b/src/web/__init__.py
index 7089019..f690819 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -12,11 +12,12 @@ import tornado.web
 from .. import Backend
 from ..decorators import *
 
-from . import handlers_api
-
 from .handlers import *
 from .ui_modules import *
 
+from . import mirrors
+from . import handlers_api
+
 # Enable logging
 tornado.options.define("debug", default=False, help="Run in debug mode", type=bool)
 tornado.options.parse_command_line()
@@ -203,11 +204,11 @@ class Application(tornado.web.Application):
 			(r"/updates", UpdatesHandler),
 
 			# Mirrors
-			(r"/mirrors", MirrorListHandler),
-			(r"/mirror/new", MirrorNewHandler),
-			(r"/mirror/([A-Za-z0-9\-\.]+)/delete", MirrorDeleteHandler),
-			(r"/mirror/([A-Za-z0-9\-\.]+)/edit", MirrorEditHandler),
-			(r"/mirror/([A-Za-z0-9\-\.]+)", MirrorDetailHandler),
+			(r"/mirrors",					mirrors.MirrorListHandler),
+			(r"/mirror/new",				mirrors.MirrorNewHandler),
+			(r"/mirror/([\w\-\.]+)/delete",	mirrors.MirrorDeleteHandler),
+			(r"/mirror/([\w\-\.]+)/edit",	mirrors.MirrorEditHandler),
+			(r"/mirror/([\w\-\.]+)",		mirrors.MirrorDetailHandler),
 
 			# Key management
 			(r"/keys", KeysListHandler),
diff --git a/src/web/handlers.py b/src/web/handlers.py
index ae103a4..6f4b2a8 100644
--- a/src/web/handlers.py
+++ b/src/web/handlers.py
@@ -10,7 +10,6 @@ from .handlers_builders import *
 from .handlers_distro import *
 from .handlers_jobs import *
 from .handlers_keys import *
-from .handlers_mirrors import *
 from .handlers_packages import *
 from .handlers_search import *
 from .handlers_updates import *
diff --git a/src/web/handlers_mirrors.py b/src/web/mirrors.py
similarity index 83%
rename from src/web/handlers_mirrors.py
rename to src/web/mirrors.py
index 43822ef..01f0020 100644
--- a/src/web/handlers_mirrors.py
+++ b/src/web/mirrors.py
@@ -8,8 +8,8 @@ from .handlers_base import BaseHandler
 
 class MirrorListHandler(BaseHandler):
 	def get(self):
-		mirrors = self.pakfire.mirrors
-		mirrors_nearby = self.pakfire.mirrors.get_for_location(self.current_address)
+		mirrors = self.backend.mirrors
+		mirrors_nearby = self.backend.mirrors.get_for_location(self.current_address)
 
 		mirrors_worldwide = []
 		for mirror in mirrors:
@@ -25,18 +25,18 @@ class MirrorListHandler(BaseHandler):
 		}
 
 		# Get recent log messages.
-		kwargs["log"] = self.pakfire.mirrors.get_history(limit=5)
+		kwargs["log"] = self.backend.mirrors.get_history(limit=5)
 
 		self.render("mirrors/list.html", **kwargs)
 
 
 class MirrorDetailHandler(BaseHandler):
 	def get(self, hostname):
-		mirror = self.pakfire.mirrors.get_by_hostname(hostname)
+		mirror = self.backend.mirrors.get_by_hostname(hostname)
 		if not mirror:
 			raise tornado.web.HTTPError(404, "Could not find mirror: %s" % hostname)
 
-		log = self.pakfire.mirrors.get_history(mirror=mirror, limit=10)
+		log = self.backend.mirrors.get_history(mirror=mirror, limit=10)
 
 		self.render("mirrors/detail.html", mirror=mirror, log=log)
 
@@ -77,9 +77,9 @@ class MirrorNewHandler(MirrorActionHandler):
 			})
 			return self.get(**errors)
 
-		mirror = mirrors.Mirror.create(self.pakfire, hostname, path,
-			user=self.current_user)
-		assert mirror
+		# Create mirror
+		with self.db.transaction():
+			mirror = self.backend.mirrors.create(hostname, path, user=self.current_user)
 
 		self.redirect("/mirror/%s" % mirror.hostname)
 
@@ -87,7 +87,7 @@ class MirrorNewHandler(MirrorActionHandler):
 class MirrorEditHandler(MirrorActionHandler):
 	@tornado.web.authenticated
 	def get(self, hostname):
-		mirror = self.pakfire.mirrors.get_by_hostname(hostname)
+		mirror = self.backend.mirrors.get_by_hostname(hostname)
 		if not mirror:
 			raise tornado.web.HTTPError(404, "Could not find mirror: %s" % hostname)
 
@@ -95,7 +95,7 @@ class MirrorEditHandler(MirrorActionHandler):
 
 	@tornado.web.authenticated
 	def post(self, hostname):
-		mirror = self.pakfire.mirrors.get_by_hostname(hostname)
+		mirror = self.backend.mirrors.get_by_hostname(hostname)
 		if not mirror:
 			raise tornado.web.HTTPError(404, "Could not find mirror: %s" % hostname)
 
@@ -112,7 +112,7 @@ class MirrorEditHandler(MirrorActionHandler):
 class MirrorDeleteHandler(MirrorActionHandler):
 	@tornado.web.authenticated
 	def get(self, hostname):
-		mirror = self.pakfire.mirrors.get_by_hostname(hostname)
+		mirror = self.backend.mirrors.get_by_hostname(hostname)
 		if not mirror:
 			raise tornado.web.HTTPError(404, "Could not find mirror: %s" % hostname)