pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Rewrote Pocket Import

Browse Source 
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
This commit is contained in:
Jeremy Benoist
2015-12-30 12:23:51 +01:00
parent b4b592a0c0
commit 252ebd6071
9 changed files with 362 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Wallabag/ImportBundle/Resources/views/Import/index.html.twig
View File

@ -8,35 +8,9 @@
<div class="card-panel settings">
{% trans %}Welcome on wallabag importer. Please select your previous service that you want to migrate.{% endtrans %}
<ul>
<li><a href="{{ path('pocket_import') }}">Pocket</a></li>
<li><a href="{{ path('import_pocket') }}">Pocket</a></li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col s12">
<div class="card-panel settings">
<div class="row">
<div class="col s12">
<form action="{{ path('import') }}" method="post" {{ form_enctype(form.import) }}>
{{ form_errors(form.import) }}
<div class="row">
<div class="input-field col s12">
<p>{% trans %}Please select your wallabag export and click on the below button to upload and import it.{% endtrans %}</p>
{{ form_errors(form.import.file) }}
{{ form_widget(form.import.file) }}
</div>
</div>
<div class="hidden">{{ form_rest(form.import) }}</div>
<button class="btn waves-effect waves-light" type="submit" name="action">
{% trans %}Upload file{% endtrans %}
</button>
</form>
</div>
</div>
</div>
</div>
</div>
{% endblock %}