Skip to content

Commit

Permalink
Use method instead of a filter to get path to a static file.
Browse files Browse the repository at this point in the history
  • Loading branch information
gentlecat committed Jan 1, 2016
1 parent 085b430 commit abc1d06
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion webserver/__init__.py
Expand Up @@ -56,7 +56,7 @@ def create_app():
from webserver import utils
app.jinja_env.filters['date'] = utils.reformat_date
app.jinja_env.filters['datetime'] = utils.reformat_datetime
app.jinja_env.filters['make_static_path'] = static_manager.get_file_path
app.context_processor(lambda: dict(get_static_path=static_manager.get_static_path))

This comment has been minimized.

Copy link
@alastair

alastair Jan 1, 2016

Collaborator

lambda \o/


# Blueprints
from webserver.views.index import index_bp
Expand Down
2 changes: 1 addition & 1 deletion webserver/static_manager.py
Expand Up @@ -13,7 +13,7 @@ def read_manifest():
manifest_content = json.load(manifest_file)


def get_file_path(resource_name):
def get_static_path(resource_name):
if resource_name not in manifest_content:
return "/static/%s" % resource_name
return "/static/build/%s" % manifest_content[resource_name]
18 changes: 9 additions & 9 deletions webserver/templates/base.html
Expand Up @@ -9,13 +9,13 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<link rel="icon" sizes="16x16" href="{{ 'images/favicon-16.png'|make_static_path }}" type="image/png" />
<link rel="icon" sizes="32x32" href="{{ 'images/favicon-32.png'|make_static_path }}" type="image/png" />
<link rel="icon" sizes="64x64" href="{{ 'images/favicon-64.png'|make_static_path }}" type="image/png" />
<link rel="icon" sizes="128x128" href="{{ 'images/favicon-128.png'|make_static_path }}" type="image/png" />
<link rel="icon" sizes="256x256" href="{{ 'images/favicon-256.png'|make_static_path }}" type="image/png" />
<link rel="icon" sizes="16x16" href="{{ get_static_path('images/favicon-16.png') }}" type="image/png" />
<link rel="icon" sizes="32x32" href="{{ get_static_path('images/favicon-32.png') }}" type="image/png" />
<link rel="icon" sizes="64x64" href="{{ get_static_path('images/favicon-64.png') }}" type="image/png" />
<link rel="icon" sizes="128x128" href="{{ get_static_path('images/favicon-128.png') }}" type="image/png" />
<link rel="icon" sizes="256x256" href="{{ get_static_path('images/favicon-256.png') }}" type="image/png" />

<link href="{{ 'main.css'|make_static_path }}" rel="stylesheet" media="screen" />
<link href="{{ get_static_path('main.css') }}" rel="stylesheet" media="screen" />
{%- endblock -%}
</head>

Expand Down Expand Up @@ -47,15 +47,15 @@
<li><a href="http://tickets.musicbrainz.org/browse/AB">Bug Tracker</a></li>
</ul>
<ul class="list-inline pull-right">
<li><a href="http://mtg.upf.edu" title="UPF"><img src="{{ 'images/mtg_upf.png'|make_static_path }}" /></a></li>
<li><a href="https://musicbrainz.org" title="MusicBrainz"><img src="{{ 'images/musicbrainz.svg'|make_static_path }}" /></a></li>
<li><a href="http://mtg.upf.edu" title="UPF"><img src="{{ get_static_path('images/mtg_upf.png') }}" /></a></li>
<li><a href="https://musicbrainz.org" title="MusicBrainz"><img src="{{ get_static_path('images/musicbrainz.svg') }}" /></a></li>
</ul>
</div>
{%- endblock -%}
</div>

{%- block scripts -%}
<script src="{{ 'common.js'|make_static_path }}"></script>
<script src="{{ get_static_path('common.js') }}"></script>
{%- endblock -%}
</body>
</html>
2 changes: 1 addition & 1 deletion webserver/templates/index/index.html
Expand Up @@ -3,7 +3,7 @@
<div id="homepage" class="row">

<div class="col-md-7 col-lg-8">
<img src="{{ 'images/logo_big.svg'|make_static_path }}" id="big-logo" />
<img src="{{ get_static_path('images/logo_big.svg') }}" id="big-logo" />
<h2 class="page-title">Welcome to AcousticBrainz!</h2>
<p>
The AcousticBrainz project aims to crowd source acoustic information for all music in the world and to make it
Expand Down
2 changes: 1 addition & 1 deletion webserver/templates/navbar.html
Expand Up @@ -10,7 +10,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand logo" href="{{ url_for('index.index') }}">
<img src="{{ 'images/navbar_logo.svg'|make_static_path }}" alt="AcousticBrainz" />
<img src="{{ get_static_path('images/navbar_logo.svg') }}" alt="AcousticBrainz" />
</a>
</div>

Expand Down
4 changes: 2 additions & 2 deletions webserver/test/test_static_manager.py
Expand Up @@ -5,5 +5,5 @@
class StaticManagerTestCase(ServerTestCase):

def test_get_file_path(self):
self.assertEqual(static_manager.get_file_path("script.js"), "/static/script.js")
self.assertEqual(static_manager.get_file_path("img/test.png"), "/static/img/test.png")
self.assertEqual(static_manager.get_static_path("script.js"), "/static/script.js")
self.assertEqual(static_manager.get_static_path("img/test.png"), "/static/img/test.png")

0 comments on commit abc1d06

Please sign in to comment.