X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FHelper%2FEntriesExport.php;h=cd74cc4f866a8e6e2b2a3d7e5b7fa63fe52008d0;hb=f808b01692a835673f328d7221ba8c212caa9b61;hp=e50c68a67a91f0870a97f254df0328ace7e886c8;hpb=99731f0bb1f6fd2815eeb9af504ce86df927657b;p=github%2Fwallabag%2Fwallabag.git
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index e50c68a6..cd74cc4f 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -8,7 +8,6 @@ use JMS\Serializer\SerializerBuilder;
use PHPePub\Core\EPub;
use PHPePub\Core\Structure\OPF\DublinCore;
use Symfony\Component\HttpFoundation\Response;
-use Craue\ConfigBundle\Util\Config;
/**
* This class doesn't have unit test BUT it's fully covered by a functional test with ExportControllerTest.
@@ -27,12 +26,12 @@ class EntriesExport
';
/**
- * @param Config $craueConfig CraueConfig instance to get wallabag instance url from database
+ * @param string $wallabagUrl Wallabag instance url
* @param string $logoPath Path to the logo FROM THE BUNDLE SCOPE
*/
- public function __construct(Config $craueConfig, $logoPath)
+ public function __construct($wallabagUrl, $logoPath)
{
- $this->wallabagUrl = $craueConfig->get('wallabag_url');
+ $this->wallabagUrl = $wallabagUrl;
$this->logoPath = $logoPath;
}
@@ -64,7 +63,7 @@ class EntriesExport
*/
public function updateTitle($method)
{
- $this->title = $method.' articles';
+ $this->title = $method . ' articles';
if ('entry' === $method) {
$this->title = $this->entries[0]->getTitle();
@@ -82,7 +81,7 @@ class EntriesExport
*/
public function exportAs($format)
{
- $functionName = 'produce'.ucfirst($format);
+ $functionName = 'produce' . ucfirst($format);
if (method_exists($this, $functionName)) {
return $this->$functionName();
}
@@ -90,6 +89,11 @@ class EntriesExport
throw new \InvalidArgumentException(sprintf('The format "%s" is not yet supported.', $format));
}
+ public function exportJsonData()
+ {
+ return $this->prepareSerializingContent('json');
+ }
+
/**
* Use PHPePub to dump a .epub file.
*
@@ -102,12 +106,12 @@ class EntriesExport
*/
$content_start =
"\n"
- ."\n"
- .''
- ."\n"
- ."wallabag articles book\n"
- ."\n"
- ."\n";
+ . "\n"
+ . ''
+ . "\n"
+ . "wallabag articles book\n"
+ . "\n"
+ . "\n";
$bookEnd = "\n\n";
@@ -144,8 +148,6 @@ class EntriesExport
$book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
}
- $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
-
$book->buildTOC();
/*
@@ -162,17 +164,19 @@ class EntriesExport
// in filenames, we limit to A-z/0-9
$filename = preg_replace('/[^A-Za-z0-9\-]/', '', $entry->getTitle());
- $chapter = $content_start.$entry->getContent().$bookEnd;
- $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
+ $chapter = $content_start . $entry->getContent() . $bookEnd;
+ $book->addChapter($entry->getTitle(), htmlspecialchars($filename) . '.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
}
+ $book->addChapter('Notices', 'Cover2.html', $content_start . $this->getExportInformation('PHPePub') . $bookEnd);
+
return Response::create(
$book->getBook(),
200,
[
'Content-Description' => 'File Transfer',
'Content-type' => 'application/epub+zip',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.epub"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.epub"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -224,7 +228,7 @@ class EntriesExport
'Accept-Ranges' => 'bytes',
'Content-Description' => 'File Transfer',
'Content-type' => 'application/x-mobipocket-ebook',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.mobi"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.mobi"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -252,7 +256,7 @@ class EntriesExport
* Front page
*/
$pdf->AddPage();
- $intro = ''.$this->title.'
'.$this->getExportInformation('tcpdf');
+ $intro = '' . $this->title . '
' . $this->getExportInformation('tcpdf');
$pdf->writeHTMLCell(0, 0, '', '', $intro, 0, 1, 0, true, '', true);
@@ -265,7 +269,7 @@ class EntriesExport
}
$pdf->AddPage();
- $html = ''.$entry->getTitle().'
';
+ $html = '' . $entry->getTitle() . '
';
$html .= $entry->getContent();
$pdf->writeHTMLCell(0, 0, '', '', $html, 0, 1, 0, true, '', true);
@@ -280,7 +284,7 @@ class EntriesExport
[
'Content-Description' => 'File Transfer',
'Content-type' => 'application/pdf',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.pdf"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.pdf"',
'Content-Transfer-Encoding' => 'binary',
]
);
@@ -326,7 +330,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/csv',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.csv"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.csv"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -344,7 +348,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/json',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.json"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.json"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -362,7 +366,7 @@ class EntriesExport
200,
[
'Content-type' => 'application/xml',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.xml"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.xml"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -378,8 +382,8 @@ class EntriesExport
$content = '';
$bar = str_repeat('=', 100);
foreach ($this->entries as $entry) {
- $content .= "\n\n".$bar."\n\n".$entry->getTitle()."\n\n".$bar."\n\n";
- $content .= trim(preg_replace('/\s+/S', ' ', strip_tags($entry->getContent())))."\n\n";
+ $content .= "\n\n" . $bar . "\n\n" . $entry->getTitle() . "\n\n" . $bar . "\n\n";
+ $content .= trim(preg_replace('/\s+/S', ' ', strip_tags($entry->getContent()))) . "\n\n";
}
return Response::create(
@@ -387,7 +391,7 @@ class EntriesExport
200,
[
'Content-type' => 'text/plain',
- 'Content-Disposition' => 'attachment; filename="'.$this->title.'.txt"',
+ 'Content-Disposition' => 'attachment; filename="' . $this->title . '.txt"',
'Content-Transfer-Encoding' => 'UTF-8',
]
);
@@ -423,7 +427,7 @@ class EntriesExport
$info = str_replace('%EXPORT_METHOD%', $type, $this->footerTemplate);
if ('tcpdf' === $type) {
- return str_replace('%IMAGE%', '
', $info);
+ return str_replace('%IMAGE%', '
', $info);
}
return str_replace('%IMAGE%', '', $info);