Move everything into a blueprint

.gitignore

@@ -4,3 +4,4 @@
 node_modules
 package-lock.json
 *srcinfo.json
+.mypy_cache

main.py

@@ -42,7 +42,7 @@ from typing import List, Set, Dict, Tuple, Optional, Generator, Any
 
 import requests
 from flask import Flask, render_template, request, url_for, redirect, \
-    make_response
+    make_response, Blueprint
 
 
 class Repository:
@@ -167,11 +167,10 @@ class AppState:
 
 UPDATE_INTERVAL = 60 * 5
 REQUEST_TIMEOUT = 60
+CACHE_LOCAL = False
 
 state = AppState()
-app = Flask(__name__)
-
-app.config["CACHE_LOCAL"] = False
+packages = Blueprint('packages', __name__, template_folder='templates')
 
 
 def cache_route(f):
@@ -480,7 +479,7 @@ def parse_repo(repo: str, repo_variant: str, url: str) -> Dict[str, Source]:
 
         source.add_desc(d, base_url)
 
-    if app.config["CACHE_LOCAL"]:
+    if CACHE_LOCAL:
         fn = url.replace("/", "_").replace(":", "_")
         if not os.path.exists(fn):
             r = requests.get(url, timeout=REQUEST_TIMEOUT)
@@ -519,7 +518,7 @@ def parse_repo(repo: str, repo_variant: str, url: str) -> Dict[str, Source]:
     return sources
 
 
-@app.template_filter('timestamp')
+@packages.app_template_filter('timestamp')
 def _jinja2_filter_timestamp(d: int) -> str:
     try:
         return datetime.datetime.fromtimestamp(
@@ -528,7 +527,7 @@ def _jinja2_filter_timestamp(d: int) -> str:
         return "-"
 
 
-@app.template_filter('filesize')
+@packages.app_template_filter('filesize')
 def _jinja2_filter_filesize(d: int) -> str:
     d = int(d)
     if d > 1024 ** 3:
@@ -537,17 +536,17 @@ def _jinja2_filter_filesize(d: int) -> str:
         return "%.2f MB" % (d / (1024 ** 2))
 
 
-@app.context_processor
+@packages.context_processor
 def funcs():
 
     def package_url(package, name=None):
         if name is None:
-            res = url_for("package", name=name or package.name)
+            res = url_for(".package", name=name or package.name)
             res += "?repo=" + package.repo
             if package.repo_variant:
                 res += "&variant=" + package.repo_variant
         else:
-            res = url_for("package", name=re.split("[<>=]+", name)[0])
+            res = url_for(".package", name=re.split("[<>=]+", name)[0])
             if package.repo_variant:
                 res += "?repo=" + package.repo
                 res += "&variant=" + package.repo_variant
@@ -573,7 +572,7 @@ def funcs():
                 update_timestamp=update_timestamp)
 
 
-@app.route('/repos')
+@packages.route('/repos')
 @cache_route
 def repos():
     global REPOSITORIES
@@ -581,13 +580,13 @@ def repos():
     return render_template('repos.html', repos=REPOSITORIES)
 
 
-@app.route('/')
+@packages.route('/')
 def index():
-    return redirect(url_for('updates'))
+    return redirect(url_for('.updates'))
 
 
-@app.route('/base')
-@app.route('/base/<name>')
+@packages.route('/base')
+@packages.route('/base/<name>')
 @cache_route
 def base(name=None):
     global state
@@ -599,8 +598,8 @@ def base(name=None):
         return render_template('baseindex.html', sources=state.sources)
 
 
-@app.route('/group/')
-@app.route('/group/<name>')
+@packages.route('/group/')
+@packages.route('/group/<name>')
 @cache_route
 def group(name=None):
     global state
@@ -622,7 +621,7 @@ def group(name=None):
         return render_template('groups.html', groups=groups)
 
 
-@app.route('/package/<name>')
+@packages.route('/package/<name>')
 @cache_route
 def package(name):
     global state
@@ -640,7 +639,7 @@ def package(name):
     return render_template('package.html', packages=packages)
 
 
-@app.route('/updates')
+@packages.route('/updates')
 @cache_route
 def updates():
     global state
@@ -967,7 +966,7 @@ def get_arch_info_for_base(s: Source) -> Optional[tuple]:
     return None
 
 
-@app.route('/outofdate')
+@packages.route('/outofdate')
 @cache_route
 def outofdate():
     global state
@@ -1010,7 +1009,7 @@ def outofdate():
         win_only=win_only)
 
 
-@app.route('/queue')
+@packages.route('/queue')
 @cache_route
 def queue():
     global state
@@ -1034,7 +1033,7 @@ def queue():
     return render_template('queue.html', updates=updates)
 
 
-@app.route('/new')
+@packages.route('/new')
 @cache_route
 def new():
     global state
@@ -1056,7 +1055,7 @@ def new():
     return render_template('new.html', new=new)
 
 
-@app.route('/removals')
+@packages.route('/removals')
 @cache_route
 def removals():
     global state
@@ -1072,7 +1071,7 @@ def removals():
     return render_template('removals.html', missing=missing)
 
 
-@app.route('/search')
+@packages.route('/search')
 @cache_route
 def search():
     global state
@@ -1103,7 +1102,7 @@ def search():
 def check_needs_update(_last_time: List[str] = [""]) -> Generator:
     """Raises RequestException"""
 
-    if app.config["CACHE_LOCAL"]:
+    if CACHE_LOCAL:
         yield True
         return
 
@@ -1148,7 +1147,7 @@ def update_sourceinfos() -> None:
     url = SRCINFO_CONFIG[0][0]
     print("Loading %r" % url)
 
-    if app.config["CACHE_LOCAL"]:
+    if CACHE_LOCAL:
         fn = url.replace("/", "_").replace(":", "_")
         if not os.path.exists(fn):
             r = requests.get(url, timeout=REQUEST_TIMEOUT)
@@ -1291,7 +1290,13 @@ class SrcInfoPackage(object):
         return packages
 
 
+app = Flask(__name__)
+app.register_blueprint(packages)
+
+
 def main(argv: List[str]) -> Any:
+    global CACHE_LOCAL
+
     from twisted.internet import reactor
     from twisted.web.server import Site
     from twisted.web.wsgi import WSGIResource
@@ -1305,7 +1310,7 @@ def main(argv: List[str]) -> Any:
     parser.add_argument("-d", "--debug", action="store_true")
     args = parser.parse_args()
 
-    app.config["CACHE_LOCAL"] = args.cache
+    CACHE_LOCAL = args.cache
     print("http://localhost:%d" % args.port)
 
     if args.debug:

templates/base.html

@@ -32,7 +32,7 @@
       <dt class="col-sm-3 text-sm-right">Group(s):</dt>
       <dd class="col-sm-9">
         {% for g in s.groups %}
-        <a href="{{ url_for('group', name=g) }}">{{ g }}</a>{{ ", " if not loop.last }}
+        <a href="{{ url_for('.group', name=g) }}">{{ g }}</a>{{ ", " if not loop.last }}
         {% else %}
         -
         {% endfor %}

templates/baseindex.html

@@ -18,7 +18,7 @@
       <tbody>
       {% for s in sources %}
         <tr>
-          <td><a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a></td>
+          <td><a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a></td>
           <td>{{ s.version }}</td>
           <td>{{ s.desc }}</td>
          </tr>

templates/group.html

@@ -3,7 +3,7 @@
 
 <div class="card mb-3">
   <div class="card-header">
-    <h4 class="card-title">Group: <a href="{{ url_for('group', name=name) }}">{{ name }}</a></h4>
+    <h4 class="card-title">Group: <a href="{{ url_for('.group', name=name) }}">{{ name }}</a></h4>
     <h6 class="card-subtitle mb-2 text-muted">Packages that are part of the group</h6>
   </div>
   <div class="card-body">

templates/groups.html

@@ -17,7 +17,7 @@
       <tbody>
       {% for g, count in groups|dictsort %}
         <tr>
-          <td><a href="{{ url_for('group', name=g) }}">{{ g }}</a></td>
+          <td><a href="{{ url_for('.group', name=g) }}">{{ g }}</a></td>
           <td>{{ count }}</td>
          </tr>
       {% endfor %}

templates/layout.html

@@ -9,7 +9,7 @@
     </head>
     <body>
     <nav class="navbar navbar-expand-md navbar-light fixed-top bg-light">
-      <a class="navbar-brand" href="{{ url_for('index') }}" style="line-height: 2em">
+      <a class="navbar-brand" href="{{ url_for('.index') }}" style="line-height: 2em">
           <img src="{{ url_for('static', filename='images/logo.svg') }}" style="width:2em;height:2em;margin-right:0.5em;" class="d-inline-block align-top" alt="MSYS2"> MSYS2 Packages
       </a>
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">

templates/navbar.html

@@ -1,27 +1,27 @@
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'updates' }}" href="{{ url_for('updates') }}">Repo Updates</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.updates' }}" href="{{ url_for('.updates') }}">Repo Updates</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'repos' }}" href="{{ url_for('repos') }}">Repos</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.repos' }}" href="{{ url_for('.repos') }}">Repos</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'base' }}" href="{{ url_for('base') }}">Packages</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.base' }}" href="{{ url_for('.base') }}">Packages</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'group' }}" href="{{ url_for('group') }}">Groups</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.group' }}" href="{{ url_for('.group') }}">Groups</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'search' }}" href="{{ url_for('search') }}">Search</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.search' }}" href="{{ url_for('.search') }}">Search</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'outofdate' }}" href="{{ url_for('outofdate') }}">Outdated</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.outofdate' }}" href="{{ url_for('.outofdate') }}">Outdated</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'queue' }}" href="{{ url_for('queue') }}">Update Queue</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.queue' }}" href="{{ url_for('.queue') }}">Update Queue</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'new' }}" href="{{ url_for('new') }}">New Queue</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.new' }}" href="{{ url_for('.new') }}">New Queue</a>
 </li>
 <li class="nav-item">
-  <a class="nav-link {{ 'active' if request.endpoint == 'removals' }}" href="{{ url_for('removals') }}">Removal Queue</a>
+  <a class="nav-link {{ 'active' if request.endpoint == 'packages.removals' }}" href="{{ url_for('.removals') }}">Removal Queue</a>
 </li>

templates/outofdate.html

@@ -29,7 +29,7 @@
       <tbody>
           {% for (s, myver, ver, url, date) in to_update %}
            <tr>
-            <td><a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a></td>
+            <td><a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a></td>
             <td>{{ myver }}</td>
             <td>→</td>
             <td><a href="{{ url }}">{{ ver }}</a></td>
@@ -41,7 +41,7 @@
 
     <h6>Packages not found in Arch Linux:</h6>
     {% for (s, arch_name) in missing %}
-        <a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a>
+        <a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a>
         <span class="text-muted">({{ arch_name }})</span>{{ ", " if not loop.last }}
     {% endfor %}
 
@@ -49,7 +49,7 @@
     <br>
     <h6>Packages marked Windows only:</h6>
     {% for s in win_only %}
-        <a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a>{{ ", " if not loop.last }}
+        <a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a>{{ ", " if not loop.last }}
     {% endfor %}
   </div>
 </div>

templates/package.html

@@ -19,7 +19,7 @@
   <div class="card-body overflow-auto">
     <dl class="row">
       <dt class="col-sm-3 text-sm-right">Base Package:</dt>
-      <dd class="col-sm-9"><a href="{{ url_for('base', name=p.base) }}">{{ p.base }}</a></dd>
+      <dd class="col-sm-9"><a href="{{ url_for('.base', name=p.base) }}">{{ p.base }}</a></dd>
 
       <dt class="col-sm-3 text-sm-right">Repo:</dt>
       <dd class="col-sm-9">{{ package_name(p, p.repo) }}</dd>

templates/queue.html

@@ -25,7 +25,7 @@
           {% for (srcpkg, s, p) in updates %}
           <tr>
             <td><a href="{{ srcpkg.history_url }}">{{ srcpkg.date }}</a></td>
-            <td><a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a></td>
+            <td><a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a></td>
             <td>{{ p.version }}</td>
             <td>→</td>
             <td>{{ srcpkg.build_version }}</td>

templates/search.html

@@ -5,7 +5,7 @@
 <div class="card">
   <div class="card-body overflow-auto">
 
-    <form class="form-inline" action="{{ url_for('search') }}" method="get">
+    <form class="form-inline" action="{{ url_for('.search') }}" method="get">
 
     Search in
     <select style="margin: 0 12px" name="t" class="custom-select custom-select-sm">
@@ -43,7 +43,7 @@
       <tbody>
       {% for s in sources %}
         <tr>
-          <td><a href="{{ url_for('base', name=s.name) }}">{{ s.name }}</a></td>
+          <td><a href="{{ url_for('.base', name=s.name) }}">{{ s.name }}</a></td>
           <td>{{ s.version }}</td>
           <td>{{ s.desc }}</td>
          </tr>