diff options
| author | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-02-10 07:39:06 +0100 |
|---|---|---|
| committer | Cédric Bonhomme <cedric@cedricbonhomme.org> | 2016-02-10 07:39:06 +0100 |
| commit | 31cabee3489feaca2ceaf223f93cd33a85ee6659 (patch) | |
| tree | c2024c5aa05f4ef9dbd7ce6259d4094cee412e94 /src | |
| parent | Fixed an error when redirecting to home from the 'duplicates' page. (diff) | |
| download | newspipe-31cabee3489feaca2ceaf223f93cd33a85ee6659.tar.gz newspipe-31cabee3489feaca2ceaf223f93cd33a85ee6659.tar.bz2 newspipe-31cabee3489feaca2ceaf223f93cd33a85ee6659.zip | |
The OPML generation now includes the category of the feeds.
Diffstat (limited to 'src')
| -rw-r--r-- | src/web/templates/opml.xml | 2 | ||||
| -rw-r--r-- | src/web/views/views.py | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/web/templates/opml.xml b/src/web/templates/opml.xml index 051d3af6..c6ebc251 100644 --- a/src/web/templates/opml.xml +++ b/src/web/templates/opml.xml @@ -9,6 +9,6 @@ <ownerEmail>{{ user.email }}</ownerEmail> </head> <body> - {% for feed in user.feeds %} <outline title="{{ feed.title|escape }}" text="{{ feed.title|escape }}" description="{{ feed.description|escape }}" xmlUrl="{{ feed.link|escape }}" htmlUrl="{{ feed.site_link|escape }}" /> + {% for feed in user.feeds %} <outline title="{{ feed.title|escape }}" text="{{ feed.title|escape }}" description="{{ feed.description|escape }}" category="{% if feed.category_id != None %}/{{ categories[feed.category_id].name }}{% endif %}" xmlUrl="{{ feed.link|escape }}" htmlUrl="{{ feed.site_link|escape }}" /> {% endfor %}</body> </opml> diff --git a/src/web/views/views.py b/src/web/views/views.py index 84f2be5f..a4631d7d 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -412,8 +412,11 @@ def export_opml(): Export all feeds to OPML. """ user = UserController(g.user.id).get(id=g.user.id) + categories = {cat.id: cat.dump() + for cat in CategoryController(g.user.id).read()} response = make_response(render_template('opml.xml', user=user, - now=datetime.datetime.now())) + categories=categories, + now=datetime.datetime.now())) response.headers['Content-Type'] = 'application/xml' response.headers['Content-Disposition'] = 'attachment; filename=feeds.opml' return response |