aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-31 13:29:33 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-31 13:29:33 +0100
commitaedd6ca0fd212abd07ec59c5fd58ea2ca99198c5 (patch)
treea004084e19819175502be86d80a1b4f691295aed /src/Wallabag
parentd1495dd0a456f0e35a09fb68679ee51f8d17bfe4 (diff)
downloadwallabag-aedd6ca0fd212abd07ec59c5fd58ea2ca99198c5.tar.gz
wallabag-aedd6ca0fd212abd07ec59c5fd58ea2ca99198c5.tar.zst
wallabag-aedd6ca0fd212abd07ec59c5fd58ea2ca99198c5.zip
Add translations & migration
Diffstat (limited to 'src/Wallabag')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php14
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php12
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php16
3 files changed, 7 insertions, 35 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index aedccfe4..9fe90357 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -370,7 +370,7 @@ class InstallCommand extends ContainerAwareCommand
370 ], 370 ],
371 [ 371 [
372 'name' => 'wallabag_url', 372 'name' => 'wallabag_url',
373 'value' => 'http://v2.wallabag.org', 373 'value' => '',
374 'section' => 'misc', 374 'section' => 'misc',
375 ], 375 ],
376 [ 376 [
@@ -401,17 +401,7 @@ class InstallCommand extends ContainerAwareCommand
401 [ 401 [
402 'name' => 'download_images_enabled', 402 'name' => 'download_images_enabled',
403 'value' => '0', 403 'value' => '0',
404 'section' => 'image', 404 'section' => 'misc',
405 ],
406 [
407 'name' => 'download_images_with_rabbitmq',
408 'value' => '0',
409 'section' => 'image',
410 ],
411 [
412 'name' => 'download_images_with_redis',
413 'value' => '0',
414 'section' => 'image',
415 ], 405 ],
416 ]; 406 ];
417 407
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
index 70a7a4ac..d0085660 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSettingData.php
@@ -143,17 +143,7 @@ class LoadSettingData extends AbstractFixture implements OrderedFixtureInterface
143 [ 143 [
144 'name' => 'download_images_enabled', 144 'name' => 'download_images_enabled',
145 'value' => '0', 145 'value' => '0',
146 'section' => 'image', 146 'section' => 'misc',
147 ],
148 [
149 'name' => 'download_images_with_rabbitmq',
150 'value' => '0',
151 'section' => 'image',
152 ],
153 [
154 'name' => 'download_images_with_redis',
155 'value' => '0',
156 'section' => 'image',
157 ], 147 ],
158 ]; 148 ];
159 149
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
index 3f2d460c..6fddcea9 100644
--- a/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/DownloadImagesSubscriber.php
@@ -111,6 +111,8 @@ class DownloadImagesSubscriber implements EventSubscriber
111 /** 111 /**
112 * Download all images from the html. 112 * Download all images from the html.
113 * 113 *
114 * @todo If we want to add async download, it should be done in that method
115 *
114 * @param Config $config 116 * @param Config $config
115 * @param Entry $entry 117 * @param Entry $entry
116 * 118 *
@@ -120,12 +122,6 @@ class DownloadImagesSubscriber implements EventSubscriber
120 { 122 {
121 $this->downloadImages->setWallabagUrl($config->get('wallabag_url')); 123 $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
122 124
123 // if ($config->get('download_images_with_rabbitmq')) {
124
125 // } else if ($config->get('download_images_with_redis')) {
126
127 // }
128
129 return $this->downloadImages->processHtml( 125 return $this->downloadImages->processHtml(
130 $entry->getContent(), 126 $entry->getContent(),
131 $entry->getUrl() 127 $entry->getUrl()
@@ -135,6 +131,8 @@ class DownloadImagesSubscriber implements EventSubscriber
135 /** 131 /**
136 * Download the preview picture. 132 * Download the preview picture.
137 * 133 *
134 * @todo If we want to add async download, it should be done in that method
135 *
138 * @param Config $config 136 * @param Config $config
139 * @param Entry $entry 137 * @param Entry $entry
140 * 138 *
@@ -144,12 +142,6 @@ class DownloadImagesSubscriber implements EventSubscriber
144 { 142 {
145 $this->downloadImages->setWallabagUrl($config->get('wallabag_url')); 143 $this->downloadImages->setWallabagUrl($config->get('wallabag_url'));
146 144
147 // if ($config->get('download_images_with_rabbitmq')) {
148
149 // } else if ($config->get('download_images_with_redis')) {
150
151 // }
152
153 return $this->downloadImages->processSingleImage( 145 return $this->downloadImages->processSingleImage(
154 $entry->getPreviewPicture(), 146 $entry->getPreviewPicture(),
155 $entry->getUrl() 147 $entry->getUrl()