Basic bootstrap CSS

chriskuehl · chriskuehl · commit 17ddeb448534 · 2022-09-15T13:34:34.000-05:00
diff --git a/pypi_view/app.py b/pypi_view/app.py
@@ -1,17 +1,22 @@
+import email
 import io
 import mimetypes
 import os.path
+import re
 
 import pygments.lexers
 import pygments.lexers.special
 import fluffy_code.code
 import fluffy_code.prebuilt_styles
 from identify import identify
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.middleware import Middleware
 from starlette.applications import Starlette
 from starlette.staticfiles import StaticFiles
 from starlette.requests import Request
 from starlette.responses import Response
 from starlette.responses import PlainTextResponse
+from starlette.responses import RedirectResponse
 from starlette.responses import StreamingResponse
 from starlette.routing import Route
 from starlette.templating import Jinja2Templates
@@ -55,7 +60,22 @@
 
 install_root = os.path.dirname(__file__)
 
-app = Starlette(debug=os.environ.get("PYPI_VIEW_DEBUG") == "1")
+
+class CacheControlHeaderMiddleware(BaseHTTPMiddleware):
+
+    async def dispatch(self, request, call_next):
+        response = await call_next(request)
+        # TODO: There should be a better way to do this...
+        response.headers["Cache-Control"] = "no-cache"
+        return response
+
+
+app = Starlette(
+    debug=os.environ.get("PYPI_VIEW_DEBUG") == "1",
+    middleware=[
+        Middleware(CacheControlHeaderMiddleware),
+    ],
+)
 app.mount('/static', StaticFiles(directory=os.path.join(install_root, 'static')), name='static')
 
 templates = Jinja2Templates(
@@ -115,13 +135,37 @@ async def package_file(request: Request) -> Response:
         )
 
     entries = await package.entries()
+    metadata_entries = [
+        entry
+        for entry in entries
+        if re.match(r'(?:[^/]+\.dist-info/METADATA|^[^/]+/PKG-INFO)$', entry.path) and entry.size <= TEXT_RENDER_FILESIZE_LIMIT
+    ]
+    if len(metadata_entries) > 0:
+        metadata_path = metadata_entries[0].path
+        metadata = {}
+
+        async with package.open_from_archive(metadata_path) as f:
+            metadata_file = io.StringIO((await f.read()).decode("utf8", errors="ignore"))
+
+        message = email.message_from_file(metadata_file)
+        metadata = {
+            key: message.get_all(key)
+            for key in set(message.keys())
+        }
+    else:
+        metadata_path = None
+        metadata = {}
+
+
     return templates.TemplateResponse(
         "package_file.html",
         {
             "request": request,
             "package": package_name,
             "filename": file_name,
             "entries": entries,
+            "metadata_path": metadata_path,
+            "metadata": metadata,
         },
     )
 
@@ -172,7 +216,7 @@ async def transfer_file():
 
         return StreamingResponse(
             transfer_file(),
-            media_type=mimetype if mimetype.startswith(MIME_WHITELIST) else None,
+            media_type=mimetype if (mimetype or "").startswith(MIME_WHITELIST) else None,
             headers={"Content-Length": str(entry.size)},
         )
 
@@ -256,3 +300,8 @@ async def transfer_file():
             "error": "This file appears to be a binary.",
         },
     )
+
+
+@app.route('/search')
+async def search(request: Request) -> Response:
+    return RedirectResponse(request.url_for('package', package=request.query_params['package']))
diff --git a/pypi_view/packaging.py b/pypi_view/packaging.py
@@ -57,7 +57,7 @@ async def __aenter__(self) -> "AsyncArchiveFile":
     async def __aexit__(self, exc_t, exc_v, exc_tb) -> None:
         await asyncio.to_thread(self.file_.close)
 
-    async def read(self, n_bytes: typing.Optional[int]) -> bytes:
+    async def read(self, n_bytes: typing.Optional[int] = None) -> bytes:
         return await asyncio.to_thread(self.file_.read, n_bytes)
 
 
diff --git a/pypi_view/static/bootstrap-5.2.1.min.css b/pypi_view/static/bootstrap-5.2.1.min.css
diff --git a/pypi_view/static/bootstrap-5.2.1.min.js b/pypi_view/static/bootstrap-5.2.1.min.js
diff --git a/pypi_view/static/site.css b/pypi_view/static/site.css
@@ -1,3 +1,2 @@
 body {
-    background-color: pink;
 }
diff --git a/pypi_view/static/site.js b/pypi_view/static/site.js
@@ -0,0 +1 @@
+document.getElementById('package-search').onfocus = (e) => e.target.select();
diff --git a/pypi_view/templates/base.html b/pypi_view/templates/base.html
@@ -1,12 +1,41 @@
 <!doctype html>
-<html>
+<html lang="en">
     <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <link rel="stylesheet" href="{{url_for('static', path='/bootstrap-5.2.1.min.css')}}" />
         <link rel="stylesheet" href="{{url_for('static', path='/site.css')}}" />
+        <title>{% block title %}{% endblock %}</title>
         {% block extra_head %}{% endblock %}
     </head>
     <body class="page-{{page}}">
-        {% block content %}{% endblock %}
+        <nav class="navbar navbar-dark bg-dark">
+            <div class="container">
+                <a class="navbar-brand" href="{{url_for('home')}}">PyPi View</a>
+                <form class="d-flex" method="GET" action="{{url_for('search')}}">
+                   <input
+                       id="package-search"
+                       class="form-control me-2"
+                       type="text"
+                       name="package"
+                       placeholder="Package name"
+                       value="{{selected_package_name}}"
+                   />
+                   <button class="btn btn-outline-success" type="submit">Go</button>
+                </form>
+                <div class="collapse navbar-collapse">
+                    foo
+                </div>
+            </div>
+        </nav>
+
+        <div class="container">
+            {% block content %}{% endblock %}
+        </div>
+
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.1/jquery.min.js"></script>
+        <script src="{{url_for('static', path='/bootstrap-5.2.1.min.js')}}"></script>
+        <script src="{{url_for('static', path='/site.js')}}"></script>
         {% block extra_js %}{% endblock %}
     </body>
 </html>
diff --git a/pypi_view/templates/home.html b/pypi_view/templates/home.html
@@ -1,5 +1,7 @@
 {% set page = 'home' %}
 {% extends 'base.html' %}
 
+{% block title %}PyPi View{% endblock %}
+
 {# vim: ft=jinja
 #}
diff --git a/pypi_view/templates/package.html b/pypi_view/templates/package.html
@@ -1,6 +1,8 @@
 {% set page = 'package' %}
 {% extends 'base.html' %}
 
+{% block title %}{{package}} | PyPi View{% endblock %}
+
 {% block content %}
     <h1>{{package}}</h1>
     {% for version in version_to_files|sort %}
diff --git a/pypi_view/templates/package_file.html b/pypi_view/templates/package_file.html
@@ -1,8 +1,32 @@
 {% set page = 'package-file' %}
+{% set selected_package_name = package %}
 {% extends 'base.html' %}
 
+{% block title %}{{filename}} | {{package}} | PyPi View{% endblock %}
+
 {% block content %}
     <h1>{{filename}}</h1>
+
+    {% if metadata_path %}
+        <h2>Metadata</h2>
+        <table border="1">
+            {% for key, values in metadata.items()|sort %}
+                {% for value in values %}
+                    <tr>
+                        {% if loop.index == 1 %}
+                            <th rowspan="{{values|length}}">{{key}}</th>
+                        {% endif %}
+                        <td>{{value}}</td>
+                    </tr>
+                {% endfor %}
+            {% endfor %}
+        </table>
+        <a href="{{url_for('package_file_archive_path', package=package, filename=filename, archive_path=metadata_path)}}">
+            View Raw Metadata
+        </a>
+    {% endif %}
+
+    <h2>Files</h2>
     <ul>
         {% for entry in entries|sort(attribute="path") %}
             <li>
diff --git a/pypi_view/templates/package_file_archive_path.html b/pypi_view/templates/package_file_archive_path.html
@@ -1,6 +1,9 @@
 {% set page = 'package-file-archive-path' %}
+{% set selected_package_name = package %}
 {% extends 'base.html' %}
 
+{% block title %}{{archive_path}} | {{filename}} | {{package}} | PyPi View{% endblock %}
+
 {% block extra_head %}
     <style>
         {{extra_css|safe}}
diff --git a/pypi_view/templates/package_file_archive_path_cannot_render.html b/pypi_view/templates/package_file_archive_path_cannot_render.html
@@ -1,6 +1,9 @@
 {% set page = 'package-file-archive-path' %}
+{% set selected_package_name = package %}
 {% extends 'base.html' %}
 
+{% block title %}{{archive_path}} | {{filename}} | {{package}} | PyPi View{% endblock %}
+
 {% block content %}
     <h1>{{package}}: {{filename}}</h1>
     <h2>{{archive_path}}</h2>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`body {`
`2`		`- background-color: pink;`
`3`	`2`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+document.getElementById('package-search').onfocus = (e) => e.target.select();`