Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1

v2 – 1st draft for Pocket import via API & Wallabag v1 import

7 files changed, 22 insertions, 0 deletions

diff --git a/app/AppKernel.php b/app/AppKernel.php
index 85edc14a..93b0201a 100644
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@@ -31,6 +31,7 @@ class AppKernel extends Kernel
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
diff --git a/app/config/config.yml b/app/config/config.yml
index 8403a458..e50f9b52 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -31,6 +31,10 @@ wallabag_core:
         fr: 'Français'
         de: 'Deutsch'
 
+wallabag_import:
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+
 # Twig Configuration
 twig:
     debug:            "%kernel.debug%"
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 149179c2..a769bc66 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -60,3 +60,6 @@ parameters:
     language: en
     from_email: no-reply@wallabag.org
     rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 0f7b61fb..1ca2f677 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,8 @@
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type:     annotation
+    prefix:   /import
+
 wallabag_api:
     resource: "@WallabagApiBundle/Resources/config/routing.yml"
     prefix: /
diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql
index 096ad8c7..88b1d2b4 100644
--- a/app/config/tests/parameters.yml.dist.mysql
+++ b/app/config/tests/parameters.yml.dist.mysql
@@ -60,3 +60,6 @@ parameters:
     language: en_US
     from_email: no-reply@wallabag.org
     rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql
index ca3f6ea2..3c61142d 100644
--- a/app/config/tests/parameters.yml.dist.pgsql
+++ b/app/config/tests/parameters.yml.dist.pgsql
@@ -60,3 +60,6 @@ parameters:
     language: en_US
     from_email: no-reply@wallabag.org
     rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx
diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite
index 92460bcf..2f7699b5 100644
--- a/app/config/tests/parameters.yml.dist.sqlite
+++ b/app/config/tests/parameters.yml.dist.sqlite
@@ -60,3 +60,6 @@ parameters:
     language: en_US
     from_email: no-reply@wallabag.org
     rss_limit: 50
+
+    # pocket import
+    pocket_consumer_key: xxxxxxxx