]> git.ipfire.org Git - people/shoehn/ipfire.org.git/blobdiff - www/webapp/__init__.py
Add torrent and magnet links for all downloads.
[people/shoehn/ipfire.org.git] / www / webapp / __init__.py
index 40eac14aa4916d31cce9711523c3cd1e5ba6d215..e23b68fcb1d9e8e18621f5a3189bac4b456bbb2e 100644 (file)
@@ -5,9 +5,10 @@ import os.path
 import simplejson
 import tornado.httpserver
 import tornado.locale
-import tornado.options
 import tornado.web
 
+from tornado.options import options
+
 import backend
 
 from handlers import *
@@ -15,23 +16,22 @@ from ui_modules import *
 
 BASEDIR = os.path.join(os.path.dirname(__file__), "..")
 
-# Enable logging
-tornado.options.enable_pretty_logging()
-tornado.options.parse_command_line()
-
-tornado.locale.load_translations(os.path.join(BASEDIR, "translations"))
+# Load translations.
+tornado.locale.load_gettext_translations(os.path.join(BASEDIR, "translations"), "webapp")
 
 class Application(tornado.web.Application):
        def __init__(self):
                settings = dict(
                        cookie_secret = "aXBmaXJlY29va2llc2VjcmV0Cg==",
-                       debug = True,
+                       debug = options.debug,
                        gzip = True,
                        login_url = "/login",
                        template_path = os.path.join(BASEDIR, "templates"),
                        ui_modules = {
+                               "DownloadButton" : DownloadButtonModule,
                                "Menu"           : MenuModule,
                                "MirrorItem"     : MirrorItemModule,
+                               "MirrorsTable"   : MirrorsTableModule,
                                "NewsItem"       : NewsItemModule,
                                "NewsLine"       : NewsLineModule,
                                "PlanetEntry"    : PlanetEntryModule,
@@ -39,6 +39,9 @@ class Application(tornado.web.Application):
                                "SidebarBanner"  : SidebarBannerModule,
                                "SidebarRelease" : SidebarReleaseModule,
                                "StasyTable"     : StasyTableModule,
+                               "StasyCPUCoreTable" : StasyCPUCoreTableModule,
+                               "StasyDeviceTable" : StasyDeviceTableModule,
+                               "StasyGeoTable"  : StasyGeoTableModule,
                                "TrackerPeerList": TrackerPeerListModule,
                        },
                        xsrf_cookies = True,
@@ -59,17 +62,25 @@ class Application(tornado.web.Application):
                        (r"/index\.?(s?html?)?", RootHandler),
 
                        # Handle news items
-                       #(r"/news/(.*)", NewsRedirectHandler),
                        (r"/news", NewsIndexHandler),
                        (r"/news/(.*)", NewsItemHandler),
                        (r"/author/(.*)", NewsAuthorHandler),
 
                        # Download sites
-                       (r"/downloads?", DownloadHandler),
-#                      # RSS feed
-#                      (r"/([A-Za-z]{2})/news.rss", RSSHandler),
-#                      (r"/data/feeds/main-([A-Za-z]{2}).rss", RSSHandler),
+                       (r"/download", DownloadHandler),
+                       (r"/downloads", tornado.web.RedirectHandler, { "url" : "/download" }),
+
+                       # Handle old pages that have moved elsewhere
+                       (r"/screenshots", tornado.web.RedirectHandler, { "url" : "/about" }),
+                       (r"/about", tornado.web.RedirectHandler, { "url" : "/features" }),
+                       (r"/support", tornado.web.RedirectHandler, { "url" : "/getinvolved" }),
+
+                       (r"/donate", tornado.web.RedirectHandler, { "url" : "/donation" }),
 
+                       # RSS feed
+                       (r"/news.rss", RSSNewsHandler),
+
+                       # Redirection for bookmarks, etc.
                        (r"/(de|en)/(.*)", LangCompatHandler)
 
                ] + static_handlers + [
@@ -77,22 +88,8 @@ class Application(tornado.web.Application):
                        (r"/(.*)", StaticHandler),
                ])
 
-               # news.ipfire.org
-               #self.add_handlers(r"news\.ipfire\.org", [
-               #       (r"/", NewsIndexHandler),
-               #       (r"/news/(.*)", NewsItemHandler),
-               #       (r"/author/(.*)", NewsAuthorHandler),
-               #] + static_handlers)
-
-               # download.ipfire.org
-               self.add_handlers(r"download\.ipfire\.org", [
-                       (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/" }),
-                       (r"/(favicon\.ico)", tornado.web.StaticFileHandler, dict(path = static_path)),
-                       (r"/(.*)", DownloadFileHandler),
-               ])
-
                # downloads.ipfire.org
-               self.add_handlers(r"downloads\.ipfire\.org", [
+               self.add_handlers(r"downloads?\.ipfire\.org", [
                        (r"/", DownloadsIndexHandler),
                        (r"/latest", DownloadsLatestHandler),
                        (r"/release/([0-9]+)", DownloadsReleaseHandler),
@@ -100,7 +97,11 @@ class Application(tornado.web.Application):
                        (r"/development", DownloadsDevelopmentHandler),
                        (r"/mirrors", tornado.web.RedirectHandler, { "url" : "http://mirrors.ipfire.org/" }),
                        (r"/source", tornado.web.RedirectHandler, { "url" : "http://source.ipfire.org/" }),
-               ] + static_handlers)
+                       (r"/download-splash", DownloadSplashHandler),
+               ] + static_handlers + [
+                       (r"/(iso|torrent)/(.*)", DownloadCompatHandler),
+                       (r"/(.*)", DownloadFileHandler),
+               ])
 
                # mirrors.ipfire.org
                self.add_handlers(r"mirrors\.ipfire\.org", [
@@ -112,15 +113,29 @@ class Application(tornado.web.Application):
                self.add_handlers(r"planet\.ipfire\.org", [
                        (r"/", PlanetMainHandler),
                        (r"/post/([A-Za-z0-9_-]+)", PlanetPostingHandler),
-                       (r"/user/([a-z0-9]+)", PlanetUserHandler),
+                       (r"/user/([a-z0-9_-]+)", PlanetUserHandler),
+
+                       # RSS
+                       (r"/rss", RSSPlanetAllHandler),
+                       (r"/user/([a-z0-9_-]+)/rss", RSSPlanetUserHandler),
                ] + static_handlers)
 
                # stasy.ipfire.org
-               self.add_handlers(r"stasy\.ipfire\.org", [
+               self.add_handlers(r"fireinfo\.ipfire\.org", [
                        (r"/", StasyIndexHandler),
-                       (r"/profile/([a-z0-9]{40})", StasyProfileHandler),
-                       (r"/statistics/cpu", StasyStatsCPUHandler),
-                       (r"/statistics/virtual", StasyStatsVirtualHandler),
+                       (r"/profile/([a-z0-9]{40})", StasyProfileDetailHandler),
+                       (r"/vendor/(pci|usb)/([0-9a-f]{4})", StasyStatsVendorDetail),
+                       (r"/model/(pci|usb)/([0-9a-f]{4})/([0-9a-f]{4})", StasyStatsModelDetail),
+
+                       # Stats handlers                        
+                       (r"/stats", StasyStatsHandler),
+                       (r"/stats/cpus", StasyStatsCPUHandler),
+                       (r"/stats/cpuflags", StasyStatsCPUFlagsHandler),
+                       (r"/stats/geo", StasyStatsGeoHandler),
+                       (r"/stats/memory", StasyStatsMemoryHandler),
+                       (r"/stats/network", StasyStatsNetworkHandler),
+                       (r"/stats/oses", StasyStatsOSesHandler),
+                       (r"/stats/virtual", StasyStatsVirtualHandler),
                ] + static_handlers)
 
                # i-use.ipfire.org
@@ -128,20 +143,35 @@ class Application(tornado.web.Application):
                        (r"/profile/([a-f0-9]{40})/([0-9]+).png", IUseImage),
                ])
 
-               # source.ipfire.org
-#              self.add_handlers(r"source\.ipfire\.org", [
-#                      (r"/", MainHandler),
-#                      (r"/[A-Za-z]{2}/?", MainHandler),
-#                      (r"/[A-Za-z]{2}/index", SourceHandler),
-#                      (r"(/source.*|/toolchains/.*)", SourceDownloadHandler),
-#              ] + static_handlers)
-
                # tracker.ipfire.org
                self.add_handlers(r"(torrent|tracker)\.ipfire\.org", [
                        (r"/", TrackerIndexHandler),
                        (r"/a.*", TrackerAnnounceHandler),
                        (r"/scrape", TrackerScrapeHandler),
                        (r"/torrent/([0-9a-f]+)", TrackerDetailHandler),
+                       (r"/([0-9a-f]{40})", TrackerDetailHandler),
+                       (r"/([0-9a-f]{40})/download", TrackerDownloadHandler),
+               ] + static_handlers)
+
+               # boot.ipfire.org
+               BOOT_STATIC_PATH = os.path.join(self.settings["static_path"], "netboot")
+               self.add_handlers(r"boot\.ipfire\.org", [
+                       (r"/", tornado.web.RedirectHandler, { "url" : "http://www.ipfire.org/download" }),
+
+                       # Configurations
+                       (r"/menu.gpxe", MenuGPXEHandler),
+                       (r"/menu.cfg", MenuCfgHandler),
+                       (r"/config/([0-9]+)/boot.gpxe", BootGPXEHandler),
+
+                       # Static files
+                       (r"/(boot.png|custom.gpxe|premenu.cfg|vesamenu.c32|menu.c32)",
+                               tornado.web.StaticFileHandler, { "path" : BOOT_STATIC_PATH }),
+               ])
+
+               # nopaste.ipfire.org
+               self.add_handlers(r"nopaste\.ipfire\.org", [
+                       (r"/", NopasteIndexHandler),
+                       (r"/([\w]{8}-[\w]{4}-[\w]{4}-[\w]{4}-[\w]{12})", NopasteEntryHandler),
                ] + static_handlers)
 
                # admin.ipfire.org
@@ -164,6 +194,12 @@ class Application(tornado.web.Application):
                        (r"/mirrors/edit/([0-9]+)", AdminMirrorsEditHandler),
                        (r"/mirrors/details/([0-9]+)", AdminMirrorsDetailsHandler),
                        (r"/mirrors/update", AdminMirrorsUpdateHandler),
+                       # Fireinfo
+                       (r"/fireinfo/stats", AdminFireinfoStatsHandler),
+                       # Downloads
+                       (r"/downloads", AdminDownloadsHandler),
+                       (r"/downloads/mirrors", AdminDownloadsMirrorsHandler),
+                       (r"/downloads/test", AdminDownloadsGraphHandler),
                        # API
                        (r"/api/planet/render", AdminApiPlanetRenderMarkupHandler)
                ] + static_handlers)
@@ -192,9 +228,6 @@ class Application(tornado.web.Application):
 
        def run(self, port=8001):
                logging.debug("Going to background")
-               
-               # All requests should be done after 30 seconds or they will be killed.
-               self.ioloop.set_blocking_log_threshold(30)
 
                http_server = tornado.httpserver.HTTPServer(self, xheaders=True)
 
@@ -205,6 +238,9 @@ class Application(tornado.web.Application):
                        http_server.start(num_processes=4)
                else:
                        http_server.listen(port)
+               
+               # All requests should be done after 30 seconds or they will be killed.
+               self.ioloop.set_blocking_log_threshold(30)
 
                self.ioloop.start()