little better

This commit is contained in:
tcit 2014-07-26 11:52:43 +02:00
parent d49446ff98
commit f8c3798522
1 changed files with 53 additions and 23 deletions

View File

@ -16,6 +16,7 @@ class WallabagEBooks
protected $entries; protected $entries;
protected $bookTitle; protected $bookTitle;
protected $bookFileName; protected $bookFileName;
protected $author = 'wallabag';
public function __construct(Poche $wallabag, $method, $value) public function __construct(Poche $wallabag, $method, $value)
{ {
@ -33,11 +34,14 @@ class WallabagEBooks
$this->entries = array($entry); $this->entries = array($entry);
$this->bookTitle = $entry['title']; $this->bookTitle = $entry['title'];
$this->bookFileName = substr($this->bookTitle, 0, 200); $this->bookFileName = substr($this->bookTitle, 0, 200);
$this->author = preg_replace('#^w{3}.#', '', Tools::getdomain($entry["url"])); # if only one article, set author to domain name (we strip the eventual www part)
Tools::logm('Producing ebook from article ' . $this->bookTitle);
break; break;
case 'all': case 'all':
$this->entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId()); $this->entries = $this->wallabag->store->retrieveAll($this->wallabag->user->getId());
$this->bookTitle = sprintf(_('All my articles on %s'), date(_('d.m.y'))); #translatable because each country has it's own date format system $this->bookTitle = sprintf(_('All my articles on %s'), date(_('d.m.y'))); #translatable because each country has it's own date format system
$this->bookFileName = _('Allarticles') . date(_('dmY')); $this->bookFileName = _('Allarticles') . date(_('dmY'));
Tools::logm('Producing ebook from all articles');
break; break;
case 'tag': case 'tag':
$tag = filter_var($this->value, FILTER_SANITIZE_STRING); $tag = filter_var($this->value, FILTER_SANITIZE_STRING);
@ -46,12 +50,14 @@ class WallabagEBooks
$this->entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId()); $this->entries = $this->wallabag->store->retrieveEntriesByTag($tag_id, $this->wallabag->user->getId());
$this->bookTitle = sprintf(_('Articles tagged %s'), $tag); $this->bookTitle = sprintf(_('Articles tagged %s'), $tag);
$this->bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200); $this->bookFileName = substr(sprintf(_('Tag %s'), $tag), 0, 200);
Tools::logm('Producing ebook from tag ' . $tag);
break; break;
case 'category': case 'category':
$category = filter_var($this->value, FILTER_SANITIZE_STRING); $category = filter_var($this->value, FILTER_SANITIZE_STRING);
$this->entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId()); $this->entries = $this->wallabag->store->getEntriesByView($category, $this->wallabag->user->getId());
$this->bookTitle = sprintf(_('All articles in category %s'), $category); $this->bookTitle = sprintf(_('All articles in category %s'), $category);
$this->bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200); $this->bookFileName = substr(sprintf(_('Category %s'), $category), 0, 200);
Tools::logm('Producing ebook from category ' . $category);
break; break;
case 'search': case 'search':
$search = filter_var($this->value, FILTER_SANITIZE_STRING); $search = filter_var($this->value, FILTER_SANITIZE_STRING);
@ -59,9 +65,10 @@ class WallabagEBooks
$this->entries = $this->wallabag->store->search($search, $this->wallabag->user->getId()); $this->entries = $this->wallabag->store->search($search, $this->wallabag->user->getId());
$this->bookTitle = sprintf(_('All articles for search %s'), $search); $this->bookTitle = sprintf(_('All articles for search %s'), $search);
$this->bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200); $this->bookFileName = substr(sprintf(_('Search %s'), $search), 0, 200);
Tools::logm('Producing ebook from search ' . $search);
break; break;
case 'default': case 'default':
die(_('Uh, there is a problem while generating epub.')); die(_('Uh, there is a problem while generating eBook.'));
} }
} }
} }
@ -73,12 +80,13 @@ class WallabagEpub extends WallabagEBooks
*/ */
public function produceEpub() public function produceEpub()
{ {
Tools::logm('Starting to produce ePub 3 file');
$content_start = $content_start =
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
. "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n" . "<html xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:epub=\"http://www.idpf.org/2007/ops\">\n"
. "<head>" . "<head>"
. "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n" . "<meta http-equiv=\"Default-Style\" content=\"text/html; charset=utf-8\" />\n"
. "<title>wallabag articles book</title>\n" . "<title>" . _("wallabag articles book") . "</title>\n"
. "</head>\n" . "</head>\n"
. "<body>\n"; . "<body>\n";
@ -95,11 +103,13 @@ class WallabagEpub extends WallabagEBooks
$log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL()); $log->logLine("getCurrentServerURL: " . $book->getCurrentServerURL());
$log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL()); $log->logLine("getCurrentPageURL..: " . $book->getCurrentPageURL());
Tools::logm('Filling metadata for ePub...');
$book->setTitle($this->bookTitle); $book->setTitle($this->bookTitle);
$book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID. $book->setIdentifier("http://$_SERVER[HTTP_HOST]", EPub::IDENTIFIER_URI); // Could also be the ISBN number, prefered for published books, or a UUID.
//$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc. //$book->setLanguage("en"); // Not needed, but included for the example, Language is mandatory, but EPub defaults to "en". Use RFC3066 Language codes, such as "en", "da", "fr" etc.
$book->setDescription(_("Some articles saved on my wallabag")); $book->setDescription(_("Some articles saved on my wallabag"));
$book->setAuthor("wallabag", "wallabag"); $book->setAuthor($this->author,$this->author);
$book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :) $book->setPublisher("wallabag", "wallabag"); // I hope this is a non existant address :)
$book->setDate(time()); // Strictly not needed as the book date defaults to time(). $book->setDate(time()); // Strictly not needed as the book date defaults to time().
//$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book. //$book->setRights("Copyright and licence information specific for the book."); // As this is generated, this _could_ contain the name or licence information of the user who purchased the book, if needed. If this is used that way, the identifier must also be made unique for the book.
@ -123,6 +133,8 @@ class WallabagEpub extends WallabagEBooks
$book->buildTOC(); $book->buildTOC();
Tools::logm('Adding actual content...');
foreach ($this->entries as $entry) { //set tags as subjects foreach ($this->entries as $entry) { //set tags as subjects
$tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']); $tags = $this->wallabag->store->retrieveTagsByEntry($entry['id']);
foreach ($tags as $tag) { foreach ($tags as $tag) {
@ -138,9 +150,11 @@ class WallabagEpub extends WallabagEBooks
if (DEBUG_POCHE) { if (DEBUG_POCHE) {
$book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation $book->addChapter("Log", "Log.html", $content_start . $log->getLog() . "\n</pre>" . $bookEnd); // log generation
Tools::logm('Production log available in produced file');
} }
$book->finalize(); $book->finalize();
$zipData = $book->sendBook($this->bookFileName); $zipData = $book->sendBook($this->bookFileName);
Tools::logm('Ebook produced');
} }
} }
@ -151,18 +165,19 @@ class WallabagMobi extends WallabagEBooks
* @author Sander Kromwijk * @author Sander Kromwijk
*/ */
private $_kindle_email;
public function produceMobi($sendByMail = FALSE) public function produceMobi($sendByMail = FALSE)
{ {
Tools::logm('Starting to produce Mobi file');
$mobi = new MOBI(); $mobi = new MOBI();
$content = new MOBIFile(); $content = new MOBIFile();
$messages = new Messages(); // for later $messages = new Messages(); // for later
Tools::logm('Filling metadata for Mobi...');
$content->set("title", $this->bookTitle); $content->set("title", $this->bookTitle);
$content->set("author", "wallabag"); $content->set("author", $this->author);
$content->set("subject", $this->bookTitle); $content->set("subject", $this->bookTitle);
# introduction # introduction
@ -170,6 +185,8 @@ class WallabagMobi extends WallabagEBooks
$content->appendImage(imagecreatefrompng("themes/baggy/img/apple-touch-icon-152.png")); $content->appendImage(imagecreatefrompng("themes/baggy/img/apple-touch-icon-152.png"));
$content->appendPageBreak(); $content->appendPageBreak();
Tools::logm('Adding actual content...');
foreach ($this->entries as $item) { foreach ($this->entries as $item) {
$content->appendChapterTitle($item['title']); $content->appendChapterTitle($item['title']);
$content->appendParagraph($item['content']); $content->appendParagraph($item['content']);
@ -180,10 +197,19 @@ class WallabagMobi extends WallabagEBooks
if (!$sendByMail) { if (!$sendByMail) {
// we offer file to download // we offer file to download
$mobi->download($this->bookFileName.'.mobi'); $mobi->download($this->bookFileName.'.mobi');
Tools::logm('Mobi file produced');
} }
else { else {
// we send file to kindle // we send file to kindle
Tools::logm('Preparing to send file by email');
$error = FALSE;
# testing Mail function
if (!function_exists('mail')) {
$error = _('Mail function is unavailable');
}
$char_in = array('/', '.', ',', ':', '|'); # we sanitize filename to avoid conflicts with special characters (for instance, / goes for a directory) $char_in = array('/', '.', ',', ':', '|'); # we sanitize filename to avoid conflicts with special characters (for instance, / goes for a directory)
$mobiExportName = preg_replace('/\s+/', '-', str_replace($char_in, '-', $this->bookFileName)) . '.mobi'; $mobiExportName = preg_replace('/\s+/', '-', str_replace($char_in, '-', $this->bookFileName)) . '.mobi';
@ -216,15 +242,17 @@ class WallabagMobi extends WallabagEBooks
$header .= "--".$uid."--"; $header .= "--".$uid."--";
# trying to get the kindle email adress # trying to get the kindle email adress
if ($this->wallabag->user->getConfigValue('kindleemail')) if (!$this->wallabag->user->getConfigValue('kindleemail'))
{ {
#do a try...exeption here $error = _('You didn\'t set your kindle\'s email adress !');
}
if (!$error) {
mail($this->wallabag->user->getConfigValue('kindleemail'), '[wallabag] ' . $this->bookTitle, "", $header ); mail($this->wallabag->user->getConfigValue('kindleemail'), '[wallabag] ' . $this->bookTitle, "", $header );
$messages->add('s', _('The email has been sent to your kindle !')); $messages->add('s', _('The email has been sent to your kindle !'));
} Tools::logm('Email sent');
else } else {
{ $messages->add('e', $error);
$messages->add('e', _('You didn\'t set your kindle\'s email adress !')); Tools::logm($error);
} }
} }
} }
@ -236,8 +264,15 @@ class WallabagPDF extends WallabagEbooks
{ {
$mpdf = new mPDF('c'); $mpdf = new mPDF('c');
# intro Tools::logm('Starting to produce PDF file');
Tools::logm('Filling metadata for PDF...');
# headers
$mpdf->SetHeader('{DATE j-m-Y}|{PAGENO}/{nb}|Produced with wallabag');
$mpdf->SetFooter('{PAGENO}');
# intro
$html = '<h1>' . $this->bookTitle . '<bookmark content="Cover" /></h1><div style="text-align:center;" > $html = '<h1>' . $this->bookTitle . '<bookmark content="Cover" /></h1><div style="text-align:center;" >
<p>' . _('Produced by wallabag with mPDF') . '</p> <p>' . _('Produced by wallabag with mPDF') . '</p>
<p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p> <p>'. _('Please open <a href="https://github.com/wallabag/wallabag/issues" >an issue</a> if you have trouble with the display of this E-Book on your device.') . '</p>
@ -245,6 +280,7 @@ class WallabagPDF extends WallabagEbooks
$html .= '<pagebreak type="next-odd" />'; $html .= '<pagebreak type="next-odd" />';
$i = 1; $i = 1;
Tools::logm('Adding actual content...');
foreach ($this->entries as $item) { foreach ($this->entries as $item) {
$html .= '<h1>' . $item['title'] . '<bookmark content="' . $item['title'] . '" /></h1>'; $html .= '<h1>' . $item['title'] . '<bookmark content="' . $item['title'] . '" /></h1>';
$html .= '<indexentry content="'. $item['title'] .'" />'; $html .= '<indexentry content="'. $item['title'] .'" />';
@ -253,16 +289,11 @@ class WallabagPDF extends WallabagEbooks
$i = $i+1; $i = $i+1;
} }
# headers
$mpdf->SetHeader('{DATE j-m-Y}|{PAGENO}/{nb}|Produced with wallabag');
$mpdf->SetFooter('{PAGENO}');
$mpdf->WriteHTML($html); $mpdf->WriteHTML($html);
# remove characters that make mpdf bug # remove characters that make mpdf bug
$char_in = array('/', '.', ',', ':', '|'); $char_in = array('/', '.', ',', ':', '|');
$pdfExportName = preg_replace('/\s+/', '-', str_replace($char_in, '-', $this->bookFileName . '.pdf')); $pdfExportName = preg_replace('/\s+/', '-', str_replace($char_in, '-', $this->bookFileName . '.pdf')); # maybe someone can make a proper regex of this ?
# index # index
$html = '<h2>Index<bookmark content="Index" /></h2> $html = '<h2>Index<bookmark content="Index" /></h2>
@ -278,7 +309,6 @@ class WallabagPDF extends WallabagEbooks
header('Content-Transfer-Encoding: base64'); header('Content-Transfer-Encoding: base64');
header('Content-Type: application/pdf'); header('Content-Type: application/pdf');
echo file_get_contents('cache/' . $pdfExportName); echo file_get_contents('cache/' . $pdfExportName);
Tools::logm('PDF file produced');
//exit;
} }
} }