From d275bdf4d36f90ff61f1e6a714c9ef64d210596f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 22 Oct 2015 16:57:56 +0200 Subject: form to upload file --- app/config/config.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 8403a458..421b2db5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,6 +30,8 @@ wallabag_core: en: 'English' fr: 'Français' de: 'Deutsch' + import: + allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] # Twig Configuration twig: -- cgit v1.2.3 From 1f4408de9ed08f3b0fda45a93f1585c80feeb21d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 20 Oct 2015 13:58:13 +0200 Subject: 1st draft for Pocket import via API --- app/config/parameters.yml.dist | 3 +++ app/config/routing.yml | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 149179c2..c0d57aa1 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: 47025-85ed5e6cfd72abbb49d12db1 diff --git a/app/config/routing.yml b/app/config/routing.yml index 0f7b61fb..91a5705f 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,3 +1,8 @@ +wallabag_import: + resource: "@WallabagImportBundle/Controller/" + type: annotation + prefix: / + wallabag_api: resource: "@WallabagApiBundle/Resources/config/routing.yml" prefix: / -- cgit v1.2.3 From 9c9c23cf0843405cd4b0de3bae8d428cb39b5720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 23 Oct 2015 14:04:43 +0200 Subject: forgot test parameters --- app/config/tests/parameters.yml.dist.mysql | 3 +++ app/config/tests/parameters.yml.dist.pgsql | 3 +++ app/config/tests/parameters.yml.dist.sqlite | 3 +++ 3 files changed, 9 insertions(+) (limited to 'app/config') diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index 096ad8c7..c0e19fe7 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: 47025-85ed5e6cfd72abbb49d12db1 diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index ca3f6ea2..d4dd9da5 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: 47025-85ed5e6cfd72abbb49d12db1 diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 92460bcf..5fbf4c70 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: 47025-85ed5e6cfd72abbb49d12db1 -- cgit v1.2.3 From dda57bb9443817e3a080d5d25343f5a7e15dd14f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 26 Oct 2015 14:38:24 +0100 Subject: fix #1502 avoid duplicate entry and store pocket url in config --- app/config/config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 421b2db5..88b1a59f 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -33,6 +33,14 @@ wallabag_core: import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] +wallabag_import: + importers: + pocket_urls: + oauth_request: https://getpocket.com/v3/oauth/request + auth_authorize: https://getpocket.com/auth/authorize + oauth_authorize: https://getpocket.com/v3/oauth/authorize + get: https://getpocket.com/v3/get + # Twig Configuration twig: debug: "%kernel.debug%" -- cgit v1.2.3 From 303768dfe9b85f87d043eb225c5c8c3a88d8c051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 26 Oct 2015 15:49:44 +0100 Subject: - remove importers configuration - add check on userId for findOneByURL for entries --- app/config/config.yml | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 88b1a59f..421b2db5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -33,14 +33,6 @@ wallabag_core: import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] -wallabag_import: - importers: - pocket_urls: - oauth_request: https://getpocket.com/v3/oauth/request - auth_authorize: https://getpocket.com/auth/authorize - oauth_authorize: https://getpocket.com/v3/oauth/authorize - get: https://getpocket.com/v3/get - # Twig Configuration twig: debug: "%kernel.debug%" -- cgit v1.2.3 From 77a7752a592af9ac821621a34d9955533baf40a0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 30 Dec 2015 10:06:45 +0100 Subject: Update after previous merge PR #1443 was merged into this branch to handle all import type in the same place. --- app/config/config.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 421b2db5..4d04d002 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,8 +30,9 @@ wallabag_core: en: 'English' fr: 'Français' de: 'Deutsch' - import: - allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] + +wallabag_import: + allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] # Twig Configuration twig: -- cgit v1.2.3 From b1d05721cf37ab94ec1a6837fe79cf19474dd0ff Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 30 Dec 2015 13:26:30 +0100 Subject: Rewrote Wallabag v1 import --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 4d04d002..e50f9b52 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -33,6 +33,7 @@ wallabag_core: wallabag_import: allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain'] + resource_dir: "%kernel.root_dir%/../web/uploads/import" # Twig Configuration twig: -- cgit v1.2.3 From 7019c7cf6c6af39c0f458769e20c3f9306477943 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 31 Dec 2015 11:24:46 +0100 Subject: Add tagged services for import - list services in /import - add url to import service - ImportBundle routing are now prefixed by /import - optimize flush in each import (flushing each 20 contents) - improve design of each import - add more tests --- app/config/routing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/routing.yml b/app/config/routing.yml index 91a5705f..1ca2f677 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -1,7 +1,7 @@ wallabag_import: resource: "@WallabagImportBundle/Controller/" type: annotation - prefix: / + prefix: /import wallabag_api: resource: "@WallabagApiBundle/Resources/config/routing.yml" -- cgit v1.2.3 From 6d7c7a6e3fbfaeefe51daf91d58f09c5b156f45a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 31 Dec 2015 11:25:04 +0100 Subject: Remove real consumer key We should never commit them :) --- app/config/parameters.yml.dist | 2 +- app/config/tests/parameters.yml.dist.mysql | 2 +- app/config/tests/parameters.yml.dist.pgsql | 2 +- app/config/tests/parameters.yml.dist.sqlite | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'app/config') diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index c0d57aa1..a769bc66 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -62,4 +62,4 @@ parameters: rss_limit: 50 # pocket import - pocket_consumer_key: 47025-85ed5e6cfd72abbb49d12db1 + pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.mysql b/app/config/tests/parameters.yml.dist.mysql index c0e19fe7..88b1d2b4 100644 --- a/app/config/tests/parameters.yml.dist.mysql +++ b/app/config/tests/parameters.yml.dist.mysql @@ -62,4 +62,4 @@ parameters: rss_limit: 50 # pocket import - pocket_consumer_key: 47025-85ed5e6cfd72abbb49d12db1 + pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.pgsql b/app/config/tests/parameters.yml.dist.pgsql index d4dd9da5..3c61142d 100644 --- a/app/config/tests/parameters.yml.dist.pgsql +++ b/app/config/tests/parameters.yml.dist.pgsql @@ -62,4 +62,4 @@ parameters: rss_limit: 50 # pocket import - pocket_consumer_key: 47025-85ed5e6cfd72abbb49d12db1 + pocket_consumer_key: xxxxxxxx diff --git a/app/config/tests/parameters.yml.dist.sqlite b/app/config/tests/parameters.yml.dist.sqlite index 5fbf4c70..2f7699b5 100644 --- a/app/config/tests/parameters.yml.dist.sqlite +++ b/app/config/tests/parameters.yml.dist.sqlite @@ -62,4 +62,4 @@ parameters: rss_limit: 50 # pocket import - pocket_consumer_key: 47025-85ed5e6cfd72abbb49d12db1 + pocket_consumer_key: xxxxxxxx -- cgit v1.2.3