From b668db242de35f13de0b317ceaa209574458e9c8 Mon Sep 17 00:00:00 2001 From: Robert Ros Date: Thu, 18 Sep 2014 21:33:22 +0200 Subject: [PATCH 01/49] Convert the MySQL charset to utf8mb4 to support the full range of unicode characters --- inc/poche/Database.class.php | 8 +++++--- install/index.php | 6 ++++-- install/mysql.sql | 12 ++++++------ 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index dfd7ae3..7aaf974 100755 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -24,15 +24,17 @@ class Database { switch (STORAGE) { case 'sqlite': // Check if /db is writeable - if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { + if ( !is_writable(STORAGE_SQLITE) || !is_writable(dirname(STORAGE_SQLITE))) { die('An error occured: "db" directory must be writeable for your web server user!'); } $db_path = 'sqlite:' . STORAGE_SQLITE; $this->handle = new PDO($db_path); break; case 'mysql': - $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; - $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD); + $db_path = 'mysql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB . ';charset=utf8mb4'; + $this->handle = new PDO($db_path, STORAGE_USER, STORAGE_PASSWORD, array( + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', + )); break; case 'postgres': $db_path = 'pgsql:host=' . STORAGE_SERVER . ';dbname=' . STORAGE_DB; diff --git a/install/index.php b/install/index.php index 1ae782a..2b080c1 100755 --- a/install/index.php +++ b/install/index.php @@ -101,12 +101,14 @@ else if (isset($_POST['install'])) { $content = file_get_contents('inc/poche/config.inc.php'); if ($_POST['db_engine'] == 'mysql') { - $db_path = 'mysql:host=' . $_POST['mysql_server'] . ';dbname=' . $_POST['mysql_database']; + $db_path = 'mysql:host=' . $_POST['mysql_server'] . ';dbname=' . $_POST['mysql_database'] . ';charset=utf8mb4'; $content = str_replace("define ('STORAGE_SERVER', 'localhost');", "define ('STORAGE_SERVER', '".$_POST['mysql_server']."');", $content); $content = str_replace("define ('STORAGE_DB', 'poche');", "define ('STORAGE_DB', '".$_POST['mysql_database']."');", $content); $content = str_replace("define ('STORAGE_USER', 'poche');", "define ('STORAGE_USER', '".$_POST['mysql_user']."');", $content); $content = str_replace("define ('STORAGE_PASSWORD', 'poche');", "define ('STORAGE_PASSWORD', '".$_POST['mysql_password']."');", $content); - $handle = new PDO($db_path, $_POST['mysql_user'], $_POST['mysql_password']); + $handle = new PDO($db_path, $_POST['mysql_user'], $_POST['mysql_password'], array( + PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8mb4', + )); $sql_structure = file_get_contents('install/mysql.sql'); } diff --git a/install/mysql.sql b/install/mysql.sql index de5640e..1b65cd3 100644 --- a/install/mysql.sql +++ b/install/mysql.sql @@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS `config` ( `name` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `entries` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS `entries` ( `content` blob NOT NULL, `user_id` int(11) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `users` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -23,7 +23,7 @@ CREATE TABLE IF NOT EXISTS `users` ( `name` varchar(255) NOT NULL, `email` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `users_config` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -31,13 +31,13 @@ CREATE TABLE IF NOT EXISTS `users_config` ( `name` varchar(255) NOT NULL, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `tags` ( `id` int(11) NOT NULL AUTO_INCREMENT, `value` varchar(255) NOT NULL, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `tags_entries` ( `id` int(11) NOT NULL AUTO_INCREMENT, @@ -46,4 +46,4 @@ CREATE TABLE IF NOT EXISTS `tags_entries` ( FOREIGN KEY(entry_id) REFERENCES entries(id) ON DELETE CASCADE, FOREIGN KEY(tag_id) REFERENCES tags(id) ON DELETE CASCADE, PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; From 2d4cfc58ec324987ad39365cbb3e4eb49df4e426 Mon Sep 17 00:00:00 2001 From: Mariusz Kozakowski <11mariom+wordpress@gmail.com> Date: Wed, 17 Sep 2014 18:44:29 +0200 Subject: [PATCH 02/49] Add support for custom http port Now you can use wallabag behind reverse proxy (i.e Squid or Varnish) without problem with urls like wallabag.example.com:8080. --- inc/poche/Tools.class.php | 1 + inc/poche/config.inc.default.php | 2 ++ 2 files changed, 3 insertions(+) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 93ec3fc..beb4f30 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -51,6 +51,7 @@ final class Tools $serverport = (!isset($_SERVER["SERVER_PORT"]) || $_SERVER["SERVER_PORT"] == '80' + || $_SERVER["SERVER_PORT"] == HTTP_PORT || ($https && $_SERVER["SERVER_PORT"] == '443') || ($https && $_SERVER["SERVER_PORT"]==SSL_PORT) //Custom HTTPS port detection ? '' : ':' . $_SERVER["SERVER_PORT"]); diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 2a45854..f666f46 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -24,6 +24,8 @@ ################################################################################# # Do not trespass unless you know what you are doing ################################################################################# +// Change this if http is running on nonstandard port - i.e is behind cache proxy +@define ('HTTP_PORT', 80); // Change this if not using the standart port for SSL - i.e you server is behind sslh @define ('SSL_PORT', 443); From ad0eccb4cd7fe4a1c463073e554d56b3398ca63b Mon Sep 17 00:00:00 2001 From: Marmo Date: Sat, 11 Oct 2014 15:22:53 +0200 Subject: [PATCH 03/49] update heise.de.txt Multi-page Telepolis-articles (www.heise.de/tp/...) are not fetched correctly atm. My addition to the single_page_link makes it work (tested with http://www.heise.de/tp/artikel/42/42579/1.html). --- inc/3rdparty/site_config/standard/heise.de.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/inc/3rdparty/site_config/standard/heise.de.txt b/inc/3rdparty/site_config/standard/heise.de.txt index c51af56..37a4aaf 100755 --- a/inc/3rdparty/site_config/standard/heise.de.txt +++ b/inc/3rdparty/site_config/standard/heise.de.txt @@ -1,7 +1,9 @@ -single_page_link: //p[@class='news_option']/a +#second part of single_page_link for telepolis-articles (desktop-version of site) +single_page_link: //p[@class='news_option']/a | //a[@id='tp-druckversion'] date: //p[@class='news_datum'] title: //h1 body: //div[@class='meldung_wrapper'] -test_url: http://www.heise.de/newsticker/meldung/Europa-soll-Grundrechteschutz-im-Netz-staerken-1392664.html \ No newline at end of file +test_url: http://www.heise.de/newsticker/meldung/Europa-soll-Grundrechteschutz-im-Netz-staerken-1392664.html +test_url: http://www.heise.de/tp/artikel/42/42579/1.html From 8ce508cab0e4963f24ba9142bab64ab996715ed9 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 12 Oct 2014 10:00:35 +0200 Subject: [PATCH 04/49] Create adme.ru.txt Siteconfig --- inc/3rdparty/site_config/standard/adme.ru.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 inc/3rdparty/site_config/standard/adme.ru.txt diff --git a/inc/3rdparty/site_config/standard/adme.ru.txt b/inc/3rdparty/site_config/standard/adme.ru.txt new file mode 100644 index 0000000..b929685 --- /dev/null +++ b/inc/3rdparty/site_config/standard/adme.ru.txt @@ -0,0 +1,6 @@ +# Generated by FiveFilters.org's web-based selection tool +# Place this file inside your site_config/custom/ folder +# Source: http://siteconfig.fivefilters.org/grab.php?url=http%3A%2F%2Fwww.adme.ru%2Ftvorchestvo-hudozhniki%2Fprostoj-kak-5-kopeek-hudozhnik-557405%2F + +body: //article[contains(concat(' ',normalize-space(@class),' '),' article ')] +test_url: http://www.adme.ru/tvorchestvo-hudozhniki/prostoj-kak-5-kopeek-hudozhnik-557405/ From b9fa7d2c9cbb0adc80fe2971df3488f9e325d7b7 Mon Sep 17 00:00:00 2001 From: tcit Date: Sun, 12 Oct 2014 10:24:07 +0200 Subject: [PATCH 05/49] fix z-index-menu mobile view bug #834 --- themes/baggy/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index b775a29..52ba50f 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -180,7 +180,7 @@ h2:after { padding-top: 9.5em; height: 100%; box-shadow:inset -4px 0 20px rgba(0,0,0,0.6); - z-index: 10; + z-index: 15; } #main { From 48fb171d7a64dbd1036f9e17cbf4c14304483817 Mon Sep 17 00:00:00 2001 From: tcit Date: Wed, 15 Oct 2014 16:47:38 +0200 Subject: [PATCH 06/49] fix for #830 --- themes/default/js/popupForm.js | 8 ++++++++ themes/default/js/saveLink.js | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/themes/default/js/popupForm.js b/themes/default/js/popupForm.js index a32e6e7..eb6d1ae 100644 --- a/themes/default/js/popupForm.js +++ b/themes/default/js/popupForm.js @@ -10,6 +10,14 @@ $(document).ready(function() { $("#search").click(function(){ closeSearch(); + // if other popup is already shown + if ($("#bagit-form").length != 0) { + $("#bagit").removeClass("active-current"); + $('#content').removeClass("opacity03"); + $("#bagit").removeClass("current"); + $("#bagit-arrow").removeClass("arrow-down"); + $("#bagit-form").hide(); + } $('#searchfield').focus(); }); diff --git a/themes/default/js/saveLink.js b/themes/default/js/saveLink.js index 6dbce97..b52b8a2 100755 --- a/themes/default/js/saveLink.js +++ b/themes/default/js/saveLink.js @@ -13,7 +13,7 @@ $.fn.ready(function() { $bagit.toggleClass("active-current"); - //only if bagiti link is not presented on page + //only if bag-it link is not presented on page if ( $bagit.length === 0 ) { if ( event !== 'undefined' && event ) { $bagitForm.css( {position:"absolute", top:event.pageY, left:event.pageX-200}); @@ -23,6 +23,11 @@ $.fn.ready(function() { } } + if ($("#search-form").length != 0) { + $("#search").removeClass("current"); + $("#search-arrow").removeClass("arrow-down"); + $("#search-form").hide(); + } $bagitForm.toggle(); $('#content').toggleClass("opacity03"); if (url !== 'undefined' && url) { From 750d904a16465bb01eac64e87aba0b27c6fb7d12 Mon Sep 17 00:00:00 2001 From: tcit Date: Fri, 17 Oct 2014 21:08:08 +0200 Subject: [PATCH 07/49] fix translation issues --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 12987 -> 14084 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 30 ++++++++++++++++++++ locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 16505 -> 17607 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 30 ++++++++++++++++++++ themes/baggy/home.twig | 4 +-- 5 files changed, 62 insertions(+), 2 deletions(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index a3c984970b4279f17783368de837c0ad58d38a03..b8132fb5278c4b311fac2f47a984bbaf9c2b5210 100644 GIT binary patch literal 14084 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 IjQ{`WAA3?_tN;K2 diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index c589866..32e96d0 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -571,6 +571,36 @@ msgstr "" msgid "Enter your search here" msgstr "Enter your search here" +msgid "Apply the tag %search_term% to this search" +msgstr "Apply the tag %search_term% to this search" + +# ebook +msgid "Fancy an E-Book ?" +msgstr "Fancy an E-Book ?" + +msgid "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." +msgstr "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." + +msgid "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." +msgstr "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." + +msgid "Download the articles from this tag in an epub" +msgstr "Download the articles from this tag in an epub" + +msgid "Download the articles from this search in an epub" +msgstr "Download the articles from this search in an epub" + +msgid "Download the articles from this category in an epub" +msgstr "Download the articles from this category in an epub" + #~ msgid "poche it!" #~ msgstr "poche it!" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index f4a28e728795c9fd86866eff27a5a531ef8fdccb..b2d8daaeae34f06a7705e1841b5fa3cb5e77f548 100644 GIT binary patch delta 5361 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 delta 4283 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 diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 0912b87..df43363 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -655,3 +655,33 @@ msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." + +msgid "Apply the tag %search_term% to this search" +msgstr "Appliquer le tag %search_term% à ces résultats" + +# ebook +msgid "Fancy an E-Book ?" +msgstr "Envie d'un E-Book ?" + +msgid "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." +msgstr "" +"Cliquez sur ce " +"lien pour obtenir tous vos articles (format ePub 3)." + +msgid "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." +msgstr "" +"Ceci peut prendre un moment et même échouer si vous avez trop " +"d'articles, selon la configuration de votre serveur." + +msgid "Download the articles from this tag in an epub" +msgstr "Télécharger les articles de ce tag dans un epub" + +msgid "Download the articles from this search in an epub" +msgstr "Télécharger les articles de cette recherche dans un epub" + +msgid "Download the articles from this category in an epub" +msgstr "Télécharger les articles de cette catégorie dans un epub" diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index e788b58..157615a 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -57,9 +57,9 @@ {% endfor %} {{ block('pager') }} - {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} + {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}{% endif %}{% endif %} - {% if search_term is defined %}{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}{% endif %} + {% if search_term is defined %}{% trans %}Apply the tag {{ search_term }} to this search{% endtrans %}{% endif %} {% if tag %}{% trans "Download the articles from this tag in an epub" %} {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} From f56791e6c482f95d1a5aef332ba69fc81f0666cb Mon Sep 17 00:00:00 2001 From: tcit Date: Sun, 19 Oct 2014 11:12:25 +0200 Subject: [PATCH 08/49] fix #873 --- themes/baggy/css/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 52ba50f..7adde2f 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -777,6 +777,10 @@ margin-top:1em; color: #FFF; } +.icon-check.archive:before { + color: #FFF; +} + /* ========================================================================== 4 = Messages ========================================================================== */ From 76b1e0babee9137974f7ce1677259b62c3b7fb4d Mon Sep 17 00:00:00 2001 From: Marmo Date: Tue, 21 Oct 2014 19:33:40 +0200 Subject: [PATCH 09/49] update zeit.de.txt for removal of inline ads --- inc/3rdparty/site_config/standard/zeit.de.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/3rdparty/site_config/standard/zeit.de.txt b/inc/3rdparty/site_config/standard/zeit.de.txt index 9815d47..8c9c171 100755 --- a/inc/3rdparty/site_config/standard/zeit.de.txt +++ b/inc/3rdparty/site_config/standard/zeit.de.txt @@ -1,3 +1,4 @@ +# 2014-10-21 [Marmo] added stripping of inline ads and appropriate test_url # 2013.10.30 [rezor92] fixed single_page_link # 2012-12-23 [carlo@...] fixed half-assed headlines in articles, removed inline author profiles, adjusted picture captions # 2012-03-17 [dkless@...] Cut metadata parts in the beginning and the ends of the content block; copyright entries for pictures removed; Author fixed, not sure if old entries still valid (I left them); Weird problems with some pages addressed (see last section for removing hidden section) @@ -16,6 +17,8 @@ author: substring-after(//li[@class='source first '], 'Quelle: ') strip_id_or_class: articleheader strip: //div[@id="comments"] | //div[@class="pagination block"] | //p[@class="ressortbacklink"] | //div[@id="relatedArticles"] | // div[@class="inline portrait"] +#Remove inline ads +strip: //div[@class="innerad"] #Removes author and date from the start strip: //ul[@class="tools"] @@ -43,3 +46,4 @@ strip_id_or_class:"pagination" footnotes: no test_url: http://www.zeit.de/kultur/film/2012-12/Kurzfilmtag +test_url: http://www.zeit.de/wissen/2014-10/ebola-nigeria-who From 606bea72e1bce1b93f29c02e89b5e82e15b2f1f9 Mon Sep 17 00:00:00 2001 From: tcit Date: Wed, 22 Oct 2014 15:10:38 +0200 Subject: [PATCH 10/49] fix #882 --- inc/poche/Routing.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php index 0b37305..6ae93d2 100755 --- a/inc/poche/Routing.class.php +++ b/inc/poche/Routing.class.php @@ -119,7 +119,7 @@ class Routing } elseif (isset($_GET['deluser'])) { $this->wallabag->deleteUser($_POST['password4deletinguser']); } elseif (isset($_GET['epub'])) { - $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['id'], $_GET['value']); + $epub = new WallabagEpub($this->wallabag, $_GET['method'], $_GET['value']); $epub->run(); } elseif (isset($_GET['import'])) { $import = $this->wallabag->import(); From 90a1a78b1e2f4d40e1d9b8e6f46aca129a9d7bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 27 Oct 2014 06:46:13 +0100 Subject: [PATCH 11/49] updated site_config --- .../site_config/standard/512pixels.net.txt | 4 +- inc/3rdparty/site_config/standard/README.md | 8 ++- .../site_config/standard/alexduner.com.txt | 2 +- .../site_config/standard/anandtech.com.txt | 6 +- .../standard/apotheke-adhoc.de.txt | 23 +++++++ .../site_config/standard/arstechnica.com.txt | 2 + .../site_config/standard/autocar.co.uk.txt | 13 ++++ .../site_config/standard/bbc.co.uk.txt | 17 +++++- inc/3rdparty/site_config/standard/bbc.com.txt | 60 +++++++++++++++++++ .../site_config/standard/bit-tech.net.txt | 19 ++++++ .../standard/bleacherreport.com.txt | 16 +++++ .../site_config/standard/blogs.faz.net.txt | 45 ++++++++++++++ .../standard/brasil.elpais.com.txt | 7 ++- .../site_config/standard/businessweek.com.txt | 41 +++++-------- .../site_config/standard/buzzfeed.com.txt | 11 +++- .../site_config/standard/canonrumors.com.txt | 28 +++++++++ .../site_config/standard/chomsky.info.txt | 3 +- .../site_config/standard/cn.reuters.com.txt | 6 +- .../standard/code.fivefilters.org.txt | 4 +- .../site_config/standard/csmonitor.com.txt | 2 +- .../standard/da.feedsportal.com.txt | 2 +- .../site_config/standard/designsponge.com.txt | 31 ++++++++++ .../site_config/standard/desitvforum.net.txt | 4 +- .../deutsche-apotheker-zeitung.de.txt | 29 +++++++++ .../standard/dictionary.reference.com.txt | 8 +-- .../site_config/standard/dropbox.com.txt | 4 +- .../site_config/standard/echo-online.de.txt | 24 ++++++++ .../site_config/standard/economist.com.txt | 7 ++- .../site_config/standard/eurogamer.net.txt | 13 ++-- .../site_config/standard/facebook.com.txt | 9 ++- inc/3rdparty/site_config/standard/faz.net.txt | 0 .../standard/finance.yahoo.com.txt | 4 +- .../site_config/standard/fivechapters.com.txt | 2 +- .../site_config/standard/fivefilters.org.txt | 5 +- .../standard/foreignpolicy.com.txt | 8 ++- .../site_config/standard/golem.de.txt | 51 +++++++++------- .../site_config/standard/heise.de.txt | 45 ++++++++++++-- .../site_config/standard/hosted.ap.org.txt | 2 +- .../site_config/standard/itunes.apple.com.txt | 14 +++++ .../site_config/standard/kachiblog.com.txt | 2 +- .../site_config/standard/lifehacker.co.uk.txt | 7 +++ .../site_config/standard/mainpost.de.txt | 2 +- .../site_config/standard/medialens.org.txt | 3 +- .../site_config/standard/medium.com.txt | 13 ++-- .../standard/menshealth.com.sg.txt | 12 ++++ .../standard/northumberlandview.ca.txt | 2 +- .../site_config/standard/nytimes.com.txt | 6 +- inc/3rdparty/site_config/standard/real.gr.txt | 6 +- .../site_config/standard/reddit.com.txt | 5 +- .../standard/searchengineland.com.txt | 2 +- .../site_config/standard/sourcebooks.com.txt | 2 +- .../site_config/standard/tabletmag.com.txt | 5 ++ .../site_config/standard/tagesspiegel.de.txt | 60 +++++++++++++++++++ .../site_config/standard/techmeme.com.txt | 2 +- .../site_config/standard/theatlantic.com.txt | 2 + .../standard/theglobeandmail.com.txt | 7 ++- .../site_config/standard/theguardian.com.txt | 13 +++- .../site_config/standard/theverge.com.txt | 7 ++- .../standard/thisiscolossal.com.txt | 25 ++++++++ .../standard/towerofthehand.com.txt | 10 ++++ .../site_config/standard/twitter.com.txt | 3 +- .../site_config/standard/vanityfair.com.txt | 5 +- inc/3rdparty/site_config/standard/wn.de.txt | 18 ++++++ inc/3rdparty/site_config/standard/zeit.de.txt | 4 -- 64 files changed, 684 insertions(+), 118 deletions(-) create mode 100755 inc/3rdparty/site_config/standard/apotheke-adhoc.de.txt create mode 100755 inc/3rdparty/site_config/standard/autocar.co.uk.txt create mode 100755 inc/3rdparty/site_config/standard/bbc.com.txt create mode 100755 inc/3rdparty/site_config/standard/bit-tech.net.txt create mode 100755 inc/3rdparty/site_config/standard/bleacherreport.com.txt create mode 100755 inc/3rdparty/site_config/standard/blogs.faz.net.txt create mode 100755 inc/3rdparty/site_config/standard/canonrumors.com.txt create mode 100755 inc/3rdparty/site_config/standard/designsponge.com.txt create mode 100755 inc/3rdparty/site_config/standard/deutsche-apotheker-zeitung.de.txt create mode 100755 inc/3rdparty/site_config/standard/echo-online.de.txt mode change 100644 => 100755 inc/3rdparty/site_config/standard/faz.net.txt create mode 100755 inc/3rdparty/site_config/standard/itunes.apple.com.txt create mode 100755 inc/3rdparty/site_config/standard/lifehacker.co.uk.txt create mode 100755 inc/3rdparty/site_config/standard/menshealth.com.sg.txt create mode 100755 inc/3rdparty/site_config/standard/tabletmag.com.txt create mode 100755 inc/3rdparty/site_config/standard/tagesspiegel.de.txt create mode 100755 inc/3rdparty/site_config/standard/thisiscolossal.com.txt create mode 100755 inc/3rdparty/site_config/standard/towerofthehand.com.txt create mode 100755 inc/3rdparty/site_config/standard/wn.de.txt diff --git a/inc/3rdparty/site_config/standard/512pixels.net.txt b/inc/3rdparty/site_config/standard/512pixels.net.txt index e458980..02a996f 100755 --- a/inc/3rdparty/site_config/standard/512pixels.net.txt +++ b/inc/3rdparty/site_config/standard/512pixels.net.txt @@ -1,2 +1,2 @@ -title: substring-before(//title, '—') -test_url: http://512pixels.net/more-on-linked-lists/ \ No newline at end of file +title: //meta[@property='og:title']/@content +test_url: http://www.512pixels.net/blog/2014/10/the-move diff --git a/inc/3rdparty/site_config/standard/README.md b/inc/3rdparty/site_config/standard/README.md index 9040ba8..ab5b12d 100755 --- a/inc/3rdparty/site_config/standard/README.md +++ b/inc/3rdparty/site_config/standard/README.md @@ -1,12 +1,14 @@ Full-Text RSS site config files ================ -[Full-Text RSS](http://fivefilters.org/content-only/), our article extraction tool, makes use of site-specific extraction rules to improve results. Each time a URL is processed, it checks to see if there are extraction rules for the site being processed. If there are no site patterns, it tries to detect the content block automatically. +[Full-Text RSS](http://fivefilters.org/content-only/), our article extraction tool, makes use of site-specific extraction rules to improve results. Each time a URL is processed, it checks to see if there are extraction rules for the site being processed. If there are no rules are found, it tries to detect the content block automatically. -This repository contains the site config files we use in Full-Text RSS. +This repository contains the site-specific extraction rules we rely on in Full-Text RSS. ### Contributing changes +We run automated tests on these files to detect issues. If you'd like to help keep these up to date, please look at the [test results](http://siteconfig.fivefilters.org/test/) and see which files you'd like to contribute fixes for. + We chose GitHub for this set of files because they offer one feature which we hope will make contributing changes easier: [file editing](https://github.com/blog/844-forking-with-the-edit-button) through the web interface. You can now make changes to any of our site config files and request that your changes be pulled into the main set we maintain. This is what GitHub calls the Fork and Pull model: @@ -31,7 +33,7 @@ Marco, Instapaper's creator, graciously opened up the database of contributions > And, recognizing that your efforts could be useful to a wide range of other tools and services, I'll make the list of all of these site-specific configurations available to the public, free, with no strings attached. -Most of the extraction rules in our set are borrowed from Instapaper. You can see the list maintained by Instapaper at [instapaper.com/bodytext/](http://instapaper.com/bodytext/) (login required). +Most of the extraction rules in our set are borrowed from Instapaper. You can see the list maintained by Instapaper at [instapaper.com/bodytext/](http://instapaper.com/bodytext/) (no longer available since Instapaper was sold). ### Testing site config files diff --git a/inc/3rdparty/site_config/standard/alexduner.com.txt b/inc/3rdparty/site_config/standard/alexduner.com.txt index bd9de9d..3897f9e 100755 --- a/inc/3rdparty/site_config/standard/alexduner.com.txt +++ b/inc/3rdparty/site_config/standard/alexduner.com.txt @@ -1,4 +1,4 @@ body: //section[@class='content'] date: //span[1] author: //h1[@id='sitetitle'] -test_url: https://alexduner.com/blog/2013/1/something-i-learned-today \ No newline at end of file +test_url: http://alexduner.com/blog/something-i-learned-today diff --git a/inc/3rdparty/site_config/standard/anandtech.com.txt b/inc/3rdparty/site_config/standard/anandtech.com.txt index 7d80491..fc95c5d 100755 --- a/inc/3rdparty/site_config/standard/anandtech.com.txt +++ b/inc/3rdparty/site_config/standard/anandtech.com.txt @@ -1,3 +1,5 @@ +body: //section[@class='main_cont']/img | //div[@class='articleContent'] +title: //div[@class='blog_top_left']//h2 author: //a[@class='b'][1] date: substring-after(substring-before(//div, 'Posted in'), ' on ') strip_image_src: /content/images/globals/ @@ -8,4 +10,6 @@ prune: no single_page_link: concat('http://www.anandtech.com/print/', substring-after(//meta[@property='og:url']/@content, '/show/')) -test_url: http://www.anandtech.com/show/5812/eurocom-monster-10-clevos-little-monster/ \ No newline at end of file +test_url: http://www.anandtech.com/show/8370/gigabyte-am1m-s2h-review +test_url: http://www.anandtech.com/show/8402/sandisk-releases-ultra-ii-ssd-the-second-tlc-nand-ssd-in-the-market +test_url: http://www.anandtech.com/show/8400/arms-cortex-m-even-smaller-and-lower-power-cpu-cores diff --git a/inc/3rdparty/site_config/standard/apotheke-adhoc.de.txt b/inc/3rdparty/site_config/standard/apotheke-adhoc.de.txt new file mode 100755 index 0000000..3a702e7 --- /dev/null +++ b/inc/3rdparty/site_config/standard/apotheke-adhoc.de.txt @@ -0,0 +1,23 @@ +# Author: zinnober + +prune: no + +title: substring-before(//div[@id='content']/h1, ',') + +single_page_link: //a[@title='Seite drucken'] + +body: //div[@id='detail-body'] + +replace_string(): +replace_string(

):

+ +# Fix headlines +replace_string(Patrick Hollstein):   +replace_string(APOTHEKE ADHOC):   +replace_string(dpa):   +replace_string(Katharina Lübke):   +replace_string(Julia Pradel):   +replace_string(Franziska Gerhardt):   + +test_url: http://www.apotheke-adhoc.de/nachrichten/politik/nachricht-detail-politik/deutscher-apothekertag-antraege-gegen-lieferengpaesse-2/ + diff --git a/inc/3rdparty/site_config/standard/arstechnica.com.txt b/inc/3rdparty/site_config/standard/arstechnica.com.txt index 767f680..eb92aa2 100755 --- a/inc/3rdparty/site_config/standard/arstechnica.com.txt +++ b/inc/3rdparty/site_config/standard/arstechnica.com.txt @@ -13,5 +13,7 @@ title: //div[@id='story']//h2[@class='title'] strip: //div[@class='pager'] next_page_link: //nav//a[span/@class='next']/@href +native_ad_clue: //meta[@property="og:url" and contains(@content, '/sponsored/')] + test_url: http://arstechnica.com/tech-policy/news/2012/02/gigabit-internet-for-80-the-unlikely-success-of-californias-sonicnet.ars test_url: http://arstechnica.com/apple/2005/04/macosx-10-4/ diff --git a/inc/3rdparty/site_config/standard/autocar.co.uk.txt b/inc/3rdparty/site_config/standard/autocar.co.uk.txt new file mode 100755 index 0000000..9f4fe18 --- /dev/null +++ b/inc/3rdparty/site_config/standard/autocar.co.uk.txt @@ -0,0 +1,13 @@ +title: //div[@class='col-center']/h1 +author: //div[@class='personality']/a +date: //div[@class='personality-date'] +body: //div[@class='content-top ']//div[@class='content'][1] | //div[contains(@class,'article-body')] | //div[contains(@class,'main-article')] + +next_page_link: //div[@id='review-link']/a + +strip: //div[@class='author-block'] +strip: //p//iframe[contains(@src,'signup')]/preceding::p[1] + +test_url: http://www.autocar.co.uk/car-review/volkswagen/golf +test_url: http://www.autocar.co.uk/car-news/pebble-beach/saleen-unveils-performance-electric-vehicle-based-tesla-model-s +test_url: http://www.autocar.co.uk/car-review/rolls-royce/first-drives/rolls-royce-ghost-series-ii-first-drive-review diff --git a/inc/3rdparty/site_config/standard/bbc.co.uk.txt b/inc/3rdparty/site_config/standard/bbc.co.uk.txt index ef1f491..bad7765 100755 --- a/inc/3rdparty/site_config/standard/bbc.co.uk.txt +++ b/inc/3rdparty/site_config/standard/bbc.co.uk.txt @@ -13,7 +13,7 @@ body: //div[contains(@class, 'hrecipe')]//div[@id='subcolumn-1'] #strip: //div[@class="story-feature narrow"] #strip: //div[@class="story-feature wide"] #strip: //div[@class="story-feature dslideshow-enclosure"] -strip: //div[contains(@class, "story-feature")] +strip: //div[contains(@class, "story-feature") and not(contains(@class, 'full-width'))] strip: //span[@class="story-date"] #strip: //div[@class="caption body-narrow-width"] strip: //div[@class="warning"]//p @@ -30,13 +30,26 @@ strip: //div[contains(@class, 'comment-introduction')] strip: //div[contains(@class, 'share-tools')] strip: //div[@id='also-related-links'] +strip_id_or_class: share-help +strip_id_or_class: comments_module + replace_string(

replace_string():
+tidy: no prune: no dissolve: //h2 + test_url: http://www.bbc.co.uk/sport/0/football/23224017 +test_contains: Swansea City have completed the club-record signing + test_url: http://www.bbc.co.uk/news/business-15060862 +test_contains: Europe's leaders are meeting again to try to solve + +# news feed +test_url: http://feeds.bbci.co.uk/news/rss.xml +# sports feed +test_url: http://feeds.bbci.co.uk/sport/0/football/rss.xml?edition=int # video entry -test_url: http://www.bbc.co.uk/news/world-asia-22056933 \ No newline at end of file +test_url: http://www.bbc.co.uk/news/world-asia-22056933 diff --git a/inc/3rdparty/site_config/standard/bbc.com.txt b/inc/3rdparty/site_config/standard/bbc.com.txt new file mode 100755 index 0000000..c04a683 --- /dev/null +++ b/inc/3rdparty/site_config/standard/bbc.com.txt @@ -0,0 +1,60 @@ +body: //div[@class="story-body"] +# for video entries +body: //div[contains(@class, "videoInStory") or @id="meta-information"] +title: //h1[@class="story-header"] +date: //span[@class="story-date"]/span[@class='date'] +# for sport site +date: //meta[@name='DCTERMS.created']/@content +author: //div[@id='headline']//span[@class='byline-name'] + +# recipes, e.g. http://www.bbc.co.uk/food/recipes/mymincepies_71055 +body: //div[contains(@class, 'hrecipe')]//div[@id='subcolumn-1'] + +#strip: //div[@class="story-feature narrow"] +#strip: //div[@class="story-feature wide"] +#strip: //div[@class="story-feature dslideshow-enclosure"] +strip: //div[contains(@class, "story-feature") and not(contains(@class, 'full-width'))] +strip: //span[@class="story-date"] +#strip: //div[@class="caption body-narrow-width"] +strip: //div[@class="warning"]//p +strip: //div[@id='page-bookmark-links-head'] +strip: //object +strip: //div[contains(@class, "bbccom_advert_placeholder")] +strip: //div[contains(@class, "embedded-hyper")] +strip: //div[contains(@class, 'market-data')] +strip: //a[contains(@class, 'hidden')] +strip: //div[contains(@class, 'hypertabs')] +strip: //div[contains(@class, 'related')] +strip: //form[@id='comment-form'] +strip: //div[contains(@class, 'comment-introduction')] +strip: //div[contains(@class, 'share-tools')] +strip: //div[@id='also-related-links'] + +strip_id_or_class: share-help +strip_id_or_class: comments_module + +replace_string(