mirror of
https://github.com/wallabag/wallabag.git
synced 2025-08-01 17:38:38 +00:00
Merge branch 'dev' into refactor
Conflicts: check_setup.php index.php
This commit is contained in:
commit
505a74ad1d
17 changed files with 846 additions and 347 deletions
17
inc/3rdparty/libraries/readability/Readability.php
vendored
Normal file → Executable file
17
inc/3rdparty/libraries/readability/Readability.php
vendored
Normal file → Executable file
|
@ -679,6 +679,7 @@ class Readability
|
|||
} else {
|
||||
$topCandidate->innerHTML = $page->documentElement->innerHTML;
|
||||
$page->documentElement->innerHTML = '';
|
||||
$this->reinitBody();
|
||||
$page->documentElement->appendChild($topCandidate);
|
||||
}
|
||||
} else {
|
||||
|
@ -794,8 +795,7 @@ class Readability
|
|||
{
|
||||
// TODO: find out why element disappears sometimes, e.g. for this URL http://www.businessinsider.com/6-hedge-fund-etfs-for-average-investors-2011-7
|
||||
// in the meantime, we check and create an empty element if it's not there.
|
||||
if (!isset($this->body->childNodes)) $this->body = $this->dom->createElement('body');
|
||||
$this->body->innerHTML = $this->bodyCache;
|
||||
$this->reinitBody();
|
||||
|
||||
if ($this->flagIsActive(self::FLAG_STRIP_UNLIKELYS)) {
|
||||
$this->removeFlag(self::FLAG_STRIP_UNLIKELYS);
|
||||
|
@ -1134,5 +1134,18 @@ class Readability
|
|||
public function removeFlag($flag) {
|
||||
$this->flags = $this->flags & ~$flag;
|
||||
}
|
||||
|
||||
/**
|
||||
* Will recreate previously deleted body property
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
protected function reinitBody() {
|
||||
if (!isset($this->body->childNodes)) {
|
||||
$this->body = $this->dom->createElement('body');
|
||||
$this->body->innerHTML = $this->bodyCache;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
14
inc/3rdparty/site_config/standard/.about.com.txt
vendored
Normal file
14
inc/3rdparty/site_config/standard/.about.com.txt
vendored
Normal file
|
@ -0,0 +1,14 @@
|
|||
body: //div[@id='articlebody']
|
||||
title: //h1
|
||||
author: //p[@id='by']//a
|
||||
|
||||
next_page_link: //span[@class='next']/a
|
||||
# Not the same as below!
|
||||
|
||||
prune: yes
|
||||
tidy: no
|
||||
|
||||
# Annoying 'next' links plainly inside the article body
|
||||
strip: //*[text()[contains(.,'Next: ')]]
|
||||
|
||||
test_url: http://psychology.about.com/od/theoriesofpersonality/ss/defensemech.htm
|
9
inc/3rdparty/site_config/standard/dn.pt.txt
vendored
Executable file
9
inc/3rdparty/site_config/standard/dn.pt.txt
vendored
Executable file
|
@ -0,0 +1,9 @@
|
|||
single_page_link: concat('http://www.dn.pt/Common/print.aspx?content_id=', //input[@type='hidden' and @name='link-comments']/@value)
|
||||
#<input type="hidden" name="link-comments" class="link-comments" value="3972244">
|
||||
|
||||
title: //h1
|
||||
author: //div[@class="Author"]
|
||||
|
||||
strip: //div[@class="Patrocinio"]
|
||||
|
||||
test_url: http://www.dn.pt/inicio/opiniao/interior.aspx?content_id=3972244&seccao=Alberto%20Gon%E7alves&tag=Opini%E3o%20-%20Em%20Foco&page=1
|
Loading…
Add table
Add a link
Reference in a new issue