mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-02 12:05:47 +00:00
Code Issues Projects Releases Wiki Activity
4374 commits 13 branches 99 tags 148 MiB
Commit graph

145 commits

Author SHA1 Message Date
Thomas Citharel 2c61db30b7
cs & fixes 2016-09-25 12:29:19 +02:00
Thomas Citharel 59201088b4
bring chrome and firefox as separate imports 2016-09-25 12:29:18 +02:00
Nicolas Lœuillet efe659ab84
Add Chrome path for Mac OS 2016-09-25 12:28:55 +02:00
Thomas Citharel ae669126e7
Import Firefox & Chrome bookmarks into wallabag 2016-09-25 12:28:54 +02:00
Jeremy Benoist 401135852c
Use scheduled entity insertions to avoid tag duplicate 
Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
 2016-09-25 12:03:49 +02:00
Jeremy Benoist 13a522dfbd
Display a message when async import won’t work 
Mostly if Redis or RabbitMQ isn’t installed / launched.
I guess it’ll avoid some issues.
 2016-09-24 19:56:15 +02:00
Jeremy Benoist 59b97fae99
Avoid losing entry when fetching fail 
Instead of just say “Failed to save entry” we’ll save the entry at all cost and try to fetch content. If fetching content failed, the entry will still be saved at least, but without content.
 2016-09-17 07:40:56 +02:00
Jeremy Benoist fbb319f064
Missing some migrations 
and CS
 2016-09-16 22:58:33 +02:00
Jeremy Benoist ebe0787e09
Moved Pocket token to user config 2016-09-16 22:22:25 +02:00
Jeremy Benoist 4fc998245c
Only display message in queue for admin 
Instead of for EVERYONE
 2016-09-16 20:08:07 +02:00
Jeremy Benoist ac87e0db2a
AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist c80cc01afa
Change flash message for queued articles 2016-09-13 21:09:05 +02:00
Jeremy Benoist e01a3c98d6
Display how many messages are queue 
- update the docker-composer to add Redis
- add migrations
 2016-09-13 20:32:52 +02:00
Jeremy Benoist ebf5e5087d
Add tests on ImportCommand 2016-09-11 22:15:31 +02:00
Jeremy Benoist 015c7a8359
Add more tests 
And ability to define how many messages can be hanle by the redis worker before stopping (usefull for tests)
 2016-09-11 22:15:31 +02:00
Jeremy Benoist 7d862f83b9
Re-facto EntryConsumer 
Using an abstract method allow to share code but also can be used it we add a new broker in the future
 2016-09-11 22:15:31 +02:00
Jeremy Benoist dc69e25f97
Display a message when async is enabled 2016-09-11 22:15:28 +02:00
Jeremy Benoist b3437d58ae
Enable Redis async import 
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
 2016-09-11 21:58:56 +02:00
Jeremy Benoist 7f7531171f
Retrieve created date from Pocket 2016-09-11 21:58:56 +02:00
Jeremy Benoist 13470c3596
Add test for RabbitMQ 
Also update Symfony deps
 2016-09-11 21:58:56 +02:00
Jeremy Benoist 8664069e1a
Fix DateTime & clear() 2016-09-11 21:58:55 +02:00
Jeremy Benoist 6d65c0a8b0
Add ability to define created_at for all import 
At the moment only Readability & wallabag v2 import allow created_at import.
Pocket removed `time_added` field from their API v2 to v3...
And wallabag v1 doesn't export that value.
 2016-09-11 21:58:55 +02:00
Jeremy Benoist 3aca0a9f00
CS 2016-09-11 21:58:55 +02:00
Jeremy Benoist 3849a9f323
Some cleanup & refactor 2016-09-11 21:58:55 +02:00
Jeremy Benoist 02f6489572
Retrieve all items from Pocket 
5000 by 5000.
Also, retrieve newest item first.
 2016-09-11 21:58:31 +02:00
Jeremy Benoist c98db1b653
Convert other imports to Rabbit 2016-09-11 21:58:31 +02:00
Jeremy Benoist ef75e1220e
Send every imported item to the queue 
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
 2016-09-11 21:57:46 +02:00
Nicolas Lœuillet 40d2a29443
Replace RabbitMQ injection with CraueConfiguration 2016-09-11 21:57:09 +02:00
Nicolas Lœuillet 56c778b415
1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00
Jeremy Benoist 88e88016b9
Clearing entities in the loop fail on Postgres 
It looks like when you clear entities on Postgres some references are lost and tags are not saved :-/
 2016-09-11 16:30:01 +02:00
Jeremy Benoist 58fadbc9df
Fix error on EntityManager clear 
Introduced in the recent 2.5.5 release.
Also updated deps.
 2016-09-11 15:53:16 +02:00
Jeremy Benoist a1a1077059
Add tests on ReadabilityImport 2016-09-01 13:39:41 +02:00
Jeremy Benoist 03e3753f6b
Add Readability import 
Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
 2016-09-01 08:00:30 +02:00
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Jeremy Benoist 4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star 
Replaced favorite word/icon with star one
 2016-08-21 22:11:20 +02:00
Jeremy Benoist 19d9efab32
Avoid breaking import when fetching fail 
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
 2016-08-20 01:17:26 +02:00
Nicolas Lœuillet 519ba0b5e7 Replaced favorite word/icon with star one 
Fix #2041
 2016-08-18 14:27:17 +02:00
Jeremy Benoist f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist 23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Nicolas Lœuillet 235026e2c7 Enhance option in command 2016-05-27 09:43:49 +02:00
Nicolas Lœuillet 3fad6c74fe Add CLI import for wallabag v2 files 2016-05-27 09:43:48 +02:00
Nicolas Lœuillet 23d24b1750
Add tests 2016-04-18 15:29:57 +02:00
Nicolas Lœuillet dc12084d93 Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live 2016-04-18 14:48:18 +02:00
Jeremy Benoist 4094ea4771 Convert array + phpDoc 
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
 2016-04-12 12:25:29 +02:00
Jeremy Benoist b787a7757e Refacto wallabag import 
Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.
 2016-03-28 16:43:33 +02:00
Jeremy Benoist 8f336fda64 Tags were not imported in wallabag v2 import 
Also, simplify exportAs matching format
 2016-03-27 23:58:37 +02:00
Jeremy Benoist 4d0ec0e721 Fix some Scrutinizer issues 2016-03-27 20:54:57 +02:00
Jeremy Benoist 4204a06b77 Add flashes messages 2016-03-20 21:12:22 +01:00
Jeremy Benoist 0d42217e4e Convert english translation file 
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
 2016-03-20 21:12:22 +01:00
Jeremy Benoist 09d8bb6fa2 Improve tests 
- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges
 2016-03-11 17:59:42 +01:00
Nicolas Lœuillet cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
Jeremy Benoist 79d0e38e7f Adding test 
Reformat json file (thanks pro.jsonlint.com)
 2016-03-04 10:04:51 +01:00
Thomas Citharel c32ae320fe cs & tests for wllbg v1 import 2016-03-03 10:03:40 +01:00
Thomas Citharel c10fcb3bbb french translation & pocket 2016-03-03 10:03:40 +01:00
Thomas Citharel fe8b37c137 Mark all imported articles as read 2016-03-03 10:03:28 +01:00
Olivier Mehani ef186de38a Make English welcome message more natural 
sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2016-02-25 11:32:40 +11:00
Jeremy Benoist c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
Thomas Citharel fca2b05200 import tags from v1 (#1657) 2016-02-12 14:49:41 +01:00
Jeremy Benoist 5db084e05b Merge pull request #1665 from wallabag/v2-translations 
lots of diverse translation stuff & some typos
 2016-02-11 16:48:46 +01:00
Thomas Citharel eaf9dad777 add tests 2016-02-11 15:48:20 +01:00
Thomas Citharel da0a9e01e9 CS 2016-02-11 13:39:21 +01:00
Thomas Citharel 0783c99a19 reimport v1 entries if they were not fetched 2016-02-11 13:27:17 +01:00
Thomas Citharel 4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Nicolas Lœuillet 4c46e2609f an other test for non empty fields 2016-02-05 14:52:35 +01:00
Nicolas Lœuillet f21a5388f9 add test to check empty fields 2016-02-05 14:39:52 +01:00
Nicolas Lœuillet a0e6a6eb67 updated fixtures 2016-02-05 14:03:58 +01:00
Nicolas Lœuillet de3b19b2ce Test if some keys are missing in v2 import 2016-02-05 13:50:16 +01:00
Nicolas Lœuillet e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page 
Settings page
 2016-02-04 15:59:57 +01:00
Jeremy Benoist 85ad629a3c Merge pull request #1601 from wallabag/v2-import-from-v2 
[#1590] Add JSON import from wallabag v2
 2016-02-01 14:17:20 +01:00
Jeremy Benoist 1e3ed71470 Add warning message for PocketImport 
Warn user if pocket_consumer_key isn't defined
 2016-01-31 14:48:26 +01:00
Jeremy Benoist 63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Nicolas Lœuillet b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet 6785f4aa74 [#1590] Add JSON import from wallabag v2 2016-01-20 14:37:01 +01:00
Nicolas Lœuillet 86719c63bf Merge pull request #1583 from wallabag/v2-fix-delete 
Fix `findOneByUrl` side effect in tests
 2016-01-15 15:47:13 +01:00
Jeremy Benoist 7883367246 Fix findOneByUrl side effect in tests 
Fix #1566
 2016-01-15 15:28:32 +01:00
Jeremy Benoist 27e475a941 Fix Pocket generateUrl parameters 2016-01-15 09:35:38 +01:00
Jeremy Benoist 1d76102a24 Fix recent update 
- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)
 2016-01-15 09:35:38 +01:00
Nicolas Lœuillet b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
Jeremy Benoist 8eedc8cfac Few phpDoc fix 
And some little mistakes
 2016-01-03 11:15:44 +01:00
Jeremy Benoist c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
Jeremy Benoist 7019c7cf6c 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
 2016-01-02 23:27:41 +01:00
Jeremy Benoist b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist 252ebd6071 Rewrote Pocket Import 
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).
 2016-01-02 23:27:41 +01:00
Jeremy Benoist 77a7752a59 Update after previous merge 
PR #1443 was merged into this branch to handle all import type in the same place.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist 7ec2897ee0 First test on PocketImport 
Giving ability to define the Client add abitliy to easliy test the import.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist 0aa344dc24 Update url & service name 
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
 2016-01-02 23:27:41 +01:00
Jeremy Benoist 5a4bbcc9a7 Change the way to check for an existing entry 
The repository method return the entry found or false if nothing exists.
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet 303768dfe9 - remove importers configuration 
- add check on userId for findOneByURL for entries
 2016-01-02 23:27:41 +01:00
Nicolas Lœuillet dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 87f23b005c assign tags to entries and add lastPocketImport attribute to user 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet d51b38ed30 create ImportController to list importers 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 557e549db7 service call 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet ff7b031d57 refactor pocket import 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00