Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222843
Change subject: Move template helpers to new blueprint
......................................................................
Move template helpers to new blueprint
Change-Id: I5c8e7df3b0e4f53830aa16e24a11572043ba2321
---
M quarry/web/app.py
A quarry/web/webhelpers.py
2 files changed, 36 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web
refs/changes/43/222843/1
diff --git a/quarry/web/app.py b/quarry/web/app.py
index 1a47b2a..0c71e74 100644
--- a/quarry/web/app.py
+++ b/quarry/web/app.py
@@ -1,4 +1,3 @@
-from datetime import datetime
from flask import Flask, render_template, redirect, session, g, request,
url_for, Response
from models.user import User, UserGroup
from models.query import Query
@@ -22,6 +21,7 @@
import worker
from login import auth
+from webhelpers import templatehelpers
__dir__ = os.path.dirname(__file__)
@@ -35,6 +35,7 @@
app.config['DEBUG'] = True
app.register_blueprint(auth)
+app.register_blueprint(templatehelpers)
app.session_interface = RedisSessionInterface()
@@ -377,35 +378,6 @@
headers={'Access-Control-Allow-Origin': '*'},
)
-
[email protected]_filter()
-def timesince(dt, default="just now"):
- """
- Returns string representing "time since" e.g.
- 3 days ago, 5 hours ago etc.
-
- From http://flask.pocoo.org/snippets/33/
- """
-
- now = datetime.utcnow()
- diff = now - dt
-
- periods = (
- (diff.days / 365, "year", "years"),
- (diff.days / 30, "month", "months"),
- (diff.days / 7, "week", "weeks"),
- (diff.days, "day", "days"),
- (diff.seconds / 3600, "hour", "hours"),
- (diff.seconds / 60, "minute", "minutes"),
- (diff.seconds, "second", "seconds"),
- )
-
- for period, singular, plural in periods:
-
- if period:
- return "%d %s ago" % (period, singular if period == 1 else plural)
-
- return default
if __name__ == '__main__':
app.run(port=5000, host="0.0.0.0")
diff --git a/quarry/web/webhelpers.py b/quarry/web/webhelpers.py
new file mode 100644
index 0000000..df7b69e
--- /dev/null
+++ b/quarry/web/webhelpers.py
@@ -0,0 +1,34 @@
+from datetime import datetime
+from flask import Blueprint
+
+templatehelpers = Blueprint('templatehelpers', __name__)
+
+
[email protected]_app_template_filter
+def timesince(dt, default="just now"):
+ """
+ Returns string representing "time since" e.g.
+ 3 days ago, 5 hours ago etc.
+
+ From http://flask.pocoo.org/snippets/33/
+ """
+
+ now = datetime.utcnow()
+ diff = now - dt
+
+ periods = (
+ (diff.days / 365, "year", "years"),
+ (diff.days / 30, "month", "months"),
+ (diff.days / 7, "week", "weeks"),
+ (diff.days, "day", "days"),
+ (diff.seconds / 3600, "hour", "hours"),
+ (diff.seconds / 60, "minute", "minutes"),
+ (diff.seconds, "second", "seconds"),
+ )
+
+ for period, singular, plural in periods:
+
+ if period:
+ return "%d %s ago" % (period, singular if period == 1 else plural)
+
+ return default
--
To view, visit https://gerrit.wikimedia.org/r/222843
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c8e7df3b0e4f53830aa16e24a11572043ba2321
Gerrit-PatchSet: 1
Gerrit-Project: analytics/quarry/web
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
