From 5ad157d2fddc23e447dfb0792911f40dc28ee8a0 Mon Sep 17 00:00:00 2001 From: logmanoriginal Date: Sat, 6 Aug 2016 16:17:58 +0200 Subject: [PATCH] bridges: Remove getCacheDuration if default BridgeAbstract will return 3600 seconds by default, so the function can be removed from any bridge implementing getCacheDuration returning the same value. Documentation updated accordingly. --- CREATE_BRIDGE.md | 8 +++----- bridges/ABCTabsBridge.php | 6 +----- bridges/CommonDreamsBridge.php | 4 ---- bridges/EZTVBridge.php | 6 +----- bridges/FootitoBridge.php | 4 ---- bridges/FuturaSciencesBridge.php | 6 +----- bridges/GitlabCommitsBridge.php | 6 +----- bridges/GuruMedBridge.php | 4 ---- bridges/InstagramBridge.php | 6 +----- bridges/KoreusBridge.php | 4 ---- bridges/LeBonCoinBridge.php | 6 +----- bridges/MsnMondeBridge.php | 4 ---- bridges/NakedSecurityBridge.php | 6 +----- bridges/NeuviemeArtBridge.php | 6 +----- bridges/NextInpactBridge.php | 4 ---- bridges/NextgovBridge.php | 6 +----- bridges/NiceMatinBridge.php | 4 ---- bridges/PinterestBridge.php | 6 +----- bridges/ReporterreBridge.php | 4 ---- bridges/Rue89Bridge.php | 5 +---- bridges/ShanaprojectBridge.php | 4 ---- bridges/T411Bridge.php | 7 +------ bridges/TheHackerNewsBridge.php | 6 +----- bridges/ThePirateBayBridge.php | 6 +----- bridges/WeLiveSecurityBridge.php | 6 +----- bridges/WorldOfTanks.php | 4 ---- bridges/ZDNetBridge.php | 6 +----- bridges/ZoneTelechargementBridge.php | 6 +----- 28 files changed, 20 insertions(+), 130 deletions(-) diff --git a/CREATE_BRIDGE.md b/CREATE_BRIDGE.md index 748ab3c..707c7a3 100644 --- a/CREATE_BRIDGE.md +++ b/CREATE_BRIDGE.md @@ -169,6 +169,8 @@ This function returns the URI to the destination site of the bridge. It will be This function returns the time in **seconds** during which rss-bridge will output cached values instead of re-generating a RSS feed. +**Notice:** rss-bridge will return `3600` seconds (1 hour) by default, so you only have to implement this function if you require different timing! + ```PHP public function getCacheDuration(){ return 3600; // 1 hour @@ -214,7 +216,7 @@ $html = $this->file_get_html('your URI'); # Template -This is a template for a new bridge: +This is the minimum template for a new bridge: ```PHP name = "ABC Tabs Bridge"; $this->uri = "http://www.abc-tabs.com/"; $this->description = "Returns 22 newest tabs"; - $this->update = "2014-07-23"; + $this->update = "2016-08-06"; } @@ -41,8 +41,4 @@ class ABCTabsBridge extends BridgeAbstract{ return "http://www.abc-tabs.com/"; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/CommonDreamsBridge.php b/bridges/CommonDreamsBridge.php index 6222661..54cf526 100644 --- a/bridges/CommonDreamsBridge.php +++ b/bridges/CommonDreamsBridge.php @@ -47,8 +47,4 @@ class CommonDreamsBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.commondreams.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hours - } } diff --git a/bridges/EZTVBridge.php b/bridges/EZTVBridge.php index 6266977..c171aee 100644 --- a/bridges/EZTVBridge.php +++ b/bridges/EZTVBridge.php @@ -7,7 +7,7 @@ class EZTVBridge extends BridgeAbstract{ $this->name = "EZTV"; $this->uri = "https://eztv.ch/"; $this->description = "Returns list of *recent* torrents for a specific show on EZTV. Get showID from URLs in https://eztv.ch/shows/showID/show-full-name."; - $this->update = "2014-01-20"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -80,8 +80,4 @@ class EZTVBridge extends BridgeAbstract{ public function getURI(){ return 'https://eztv.ch/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/FootitoBridge.php b/bridges/FootitoBridge.php index cfd1496..a66dd82 100644 --- a/bridges/FootitoBridge.php +++ b/bridges/FootitoBridge.php @@ -49,8 +49,4 @@ class FootitoBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.footito.fr/'; } - - public function getCacheDuration(){ - return 3600; // 1h hours - } } diff --git a/bridges/FuturaSciencesBridge.php b/bridges/FuturaSciencesBridge.php index f8d0398..0a37051 100644 --- a/bridges/FuturaSciencesBridge.php +++ b/bridges/FuturaSciencesBridge.php @@ -7,7 +7,7 @@ class FuturaSciencesBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'Returns the newest articles.'; - $this->update = '2016-08-03'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -226,8 +226,4 @@ class FuturaSciencesBridge extends BridgeAbstract { public function getURI() { return 'http://www.futura-sciences.com/'; } - - public function getCacheDuration() { - return 3600; - } } diff --git a/bridges/GitlabCommitsBridge.php b/bridges/GitlabCommitsBridge.php index df04d63..030c74b 100644 --- a/bridges/GitlabCommitsBridge.php +++ b/bridges/GitlabCommitsBridge.php @@ -12,7 +12,7 @@ class GitlabCommitsBridge extends BridgeAbstract{ $this->name = 'Gitlab Commits'; $this->uri = ''; $this->description = 'Returns the commits of a project hosted on a gitlab instance'; - $this->update = '2016-06-19'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -87,8 +87,4 @@ class GitlabCommitsBridge extends BridgeAbstract{ public function getURI(){ return ''; } - - public function getCacheDuration(){ - return 3600; // one hour - } } diff --git a/bridges/GuruMedBridge.php b/bridges/GuruMedBridge.php index ec94415..57252a0 100644 --- a/bridges/GuruMedBridge.php +++ b/bridges/GuruMedBridge.php @@ -39,8 +39,4 @@ class GuruMedBridge extends BridgeAbstract{ public function getURI(){ return 'http://gurumed.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/InstagramBridge.php b/bridges/InstagramBridge.php index b39b7e0..104022b 100644 --- a/bridges/InstagramBridge.php +++ b/bridges/InstagramBridge.php @@ -9,7 +9,7 @@ class InstagramBridge extends BridgeAbstract{ $this->name = "Instagram Bridge"; $this->uri = "http://instagram.com/"; $this->description = "Returns the newest images"; - $this->update = "2014-05-25"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -81,8 +81,4 @@ class InstagramBridge extends BridgeAbstract{ public function getURI(){ return 'http://instagram.com/'; } - - public function getCacheDuration(){ - return 3600; - } } diff --git a/bridges/KoreusBridge.php b/bridges/KoreusBridge.php index 80bb963..830d75f 100644 --- a/bridges/KoreusBridge.php +++ b/bridges/KoreusBridge.php @@ -46,8 +46,4 @@ class KoreusBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.koreus.com/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/LeBonCoinBridge.php b/bridges/LeBonCoinBridge.php index 14ca16f..e6d0427 100755 --- a/bridges/LeBonCoinBridge.php +++ b/bridges/LeBonCoinBridge.php @@ -7,7 +7,7 @@ class LeBonCoinBridge extends BridgeAbstract{ $this->name = "LeBonCoin"; $this->uri = "http://www.leboncoin.fr"; $this->description = "Returns most recent results from LeBonCoin for a region, and optionally a category and a keyword ."; - $this->update = "2016-05-02"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -283,8 +283,4 @@ class LeBonCoinBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.leboncoin.fr'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } \ No newline at end of file diff --git a/bridges/MsnMondeBridge.php b/bridges/MsnMondeBridge.php index 783f6e0..4b833c9 100644 --- a/bridges/MsnMondeBridge.php +++ b/bridges/MsnMondeBridge.php @@ -37,8 +37,4 @@ class MsnMondeBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.msn.com/fr-fr/actualite/monde'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/NakedSecurityBridge.php b/bridges/NakedSecurityBridge.php index b785764..355cbbc 100644 --- a/bridges/NakedSecurityBridge.php +++ b/bridges/NakedSecurityBridge.php @@ -6,7 +6,7 @@ class NakedSecurityBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'Returns the newest articles.'; - $this->update = '2016-04-30'; + $this->update = '2016-08-06'; } public function collectData(array $param) { @@ -77,8 +77,4 @@ class NakedSecurityBridge extends BridgeAbstract { public function getURI() { return 'https://nakedsecurity.sophos.com/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NeuviemeArtBridge.php b/bridges/NeuviemeArtBridge.php index 07b85a9..5ee207a 100644 --- a/bridges/NeuviemeArtBridge.php +++ b/bridges/NeuviemeArtBridge.php @@ -6,7 +6,7 @@ class NeuviemeArtBridge extends BridgeAbstract { $this->name = "9ème Art"; $this->uri = "http://www.9emeart.fr/"; $this->description = "Returns the newest articles."; - $this->update = "2016-02-05"; + $this->update = "2016-08-06"; } public function collectData(array $param) { @@ -63,8 +63,4 @@ class NeuviemeArtBridge extends BridgeAbstract { public function getURI() { return 'http://www.9emeart.fr/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NextInpactBridge.php b/bridges/NextInpactBridge.php index c3026bf..ee89ab1 100644 --- a/bridges/NextInpactBridge.php +++ b/bridges/NextInpactBridge.php @@ -52,8 +52,4 @@ class NextInpactBridge extends BridgeAbstract { public function getURI() { return 'http://www.nextinpact.com/'; } - - public function getCacheDuration() { - return 3600; // 1 hour - } } diff --git a/bridges/NextgovBridge.php b/bridges/NextgovBridge.php index eac7aa1..7fdde73 100644 --- a/bridges/NextgovBridge.php +++ b/bridges/NextgovBridge.php @@ -7,7 +7,7 @@ class NextgovBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'USA Federal technology news, best practices, and web 2.0 tools.'; - $this->update = '2016-07-20'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -103,8 +103,4 @@ class NextgovBridge extends BridgeAbstract { public function getURI() { return 'https://www.nextgov.com/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/NiceMatinBridge.php b/bridges/NiceMatinBridge.php index 96b1921..aa41822 100644 --- a/bridges/NiceMatinBridge.php +++ b/bridges/NiceMatinBridge.php @@ -53,8 +53,4 @@ class NiceMatinBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.nicematin.com/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/PinterestBridge.php b/bridges/PinterestBridge.php index 7b05511..f6c0e33 100644 --- a/bridges/PinterestBridge.php +++ b/bridges/PinterestBridge.php @@ -11,7 +11,7 @@ class PinterestBridge extends BridgeAbstract{ $this->name = "Pinterest Bridge"; $this->uri = "http://www.pinterest.com/"; $this->description = "Returns the newest images on a board"; - $this->update = "2014-05-25"; + $this->update = "2016-08-06"; $this->parameters["By username and board"] = '[ @@ -114,8 +114,4 @@ class PinterestBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.pinterest.com'; } - - public function getCacheDuration(){ - return 3600; - } } diff --git a/bridges/ReporterreBridge.php b/bridges/ReporterreBridge.php index b15c969..702f13d 100644 --- a/bridges/ReporterreBridge.php +++ b/bridges/ReporterreBridge.php @@ -50,8 +50,4 @@ class ReporterreBridge extends BridgeAbstract{ public function getURI(){ return 'http://www.reporterre.net/'; } - - public function getCacheDuration(){ - return 3600; // 1 hours - } } diff --git a/bridges/Rue89Bridge.php b/bridges/Rue89Bridge.php index 92bd9e9..2a2b8f1 100644 --- a/bridges/Rue89Bridge.php +++ b/bridges/Rue89Bridge.php @@ -7,7 +7,7 @@ class Rue89Bridge extends BridgeAbstract{ $this->name = "Rue89"; $this->uri = "http://rue89.nouvelobs.com/"; $this->description = "Returns the 5 newest posts from Rue89 (full text)"; - $this->update = "2015-01-30"; + $this->update = "2016-08-06"; } @@ -50,7 +50,4 @@ class Rue89Bridge extends BridgeAbstract{ public function getURI(){ return 'http://rue89.nouvelobs.com/'; } - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/ShanaprojectBridge.php b/bridges/ShanaprojectBridge.php index 8a7f2c1..59106a5 100644 --- a/bridges/ShanaprojectBridge.php +++ b/bridges/ShanaprojectBridge.php @@ -117,8 +117,4 @@ class ShanaprojectBridge extends BridgeAbstract { public function getURI(){ return 'http://www.shanaproject.com'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/T411Bridge.php b/bridges/T411Bridge.php index 9d9ff24..76d7f4a 100644 --- a/bridges/T411Bridge.php +++ b/bridges/T411Bridge.php @@ -7,7 +7,7 @@ class T411Bridge extends BridgeAbstract { $this->name = 'T411'; $this->uri = $this->getURI(); $this->description = 'Returns the 10 newest torrents with specified search terms
Use url part after "?" mark when using their search engine.'; - $this->update = '2016-06-25'; + $this->update = '2016-08-06'; $this->parameters[] = '[ @@ -102,10 +102,5 @@ class T411Bridge extends BridgeAbstract { public function getURI() { return 'https://t411.ch/'; } - - public function getCacheDuration() { - return 3600; // 1 hour - } - } diff --git a/bridges/TheHackerNewsBridge.php b/bridges/TheHackerNewsBridge.php index 4081b93..e09432c 100644 --- a/bridges/TheHackerNewsBridge.php +++ b/bridges/TheHackerNewsBridge.php @@ -7,7 +7,7 @@ class TheHackerNewsBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'Cyber Security, Hacking, Technology News.'; - $this->update = '2016-07-22'; + $this->update = '2016-08-06'; } @@ -83,8 +83,4 @@ class TheHackerNewsBridge extends BridgeAbstract { public function getURI() { return 'https://thehackernews.com/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/ThePirateBayBridge.php b/bridges/ThePirateBayBridge.php index 6f6d318..c8b8b68 100644 --- a/bridges/ThePirateBayBridge.php +++ b/bridges/ThePirateBayBridge.php @@ -7,7 +7,7 @@ class ThePirateBayBridge extends BridgeAbstract{ $this->name = "The Pirate Bay"; $this->uri = "https://thepiratebay.org/"; $this->description = "Returns results for the keywords. You can put several list of keywords by separating them with a semicolon (e.g. \"one show;another show\")"; - $this->update = "2015-01-09"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -88,8 +88,4 @@ class ThePirateBayBridge extends BridgeAbstract{ public function getURI(){ return 'https://thepiratebay.org/'; } - - public function getCacheDuration(){ - return 3600; // 1 hour - } } diff --git a/bridges/WeLiveSecurityBridge.php b/bridges/WeLiveSecurityBridge.php index cdb04bd..97cd58a 100644 --- a/bridges/WeLiveSecurityBridge.php +++ b/bridges/WeLiveSecurityBridge.php @@ -6,7 +6,7 @@ class WeLiveSecurityBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'Returns the newest articles.'; - $this->update = '2016-07-19'; + $this->update = '2016-08-06'; } public function collectData(array $param) { @@ -68,8 +68,4 @@ class WeLiveSecurityBridge extends BridgeAbstract { public function getURI() { return 'http://www.welivesecurity.com/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } \ No newline at end of file diff --git a/bridges/WorldOfTanks.php b/bridges/WorldOfTanks.php index 3a1d2b4..8912358 100644 --- a/bridges/WorldOfTanks.php +++ b/bridges/WorldOfTanks.php @@ -101,8 +101,4 @@ class WorldOfTanks extends HttpCachingBridgeAbstract{ public function getURI(){ return $this->uri; } - - public function getCacheDuration(){ - return 3600; // 2h hours - } } diff --git a/bridges/ZDNetBridge.php b/bridges/ZDNetBridge.php index 79924aa..92ac649 100644 --- a/bridges/ZDNetBridge.php +++ b/bridges/ZDNetBridge.php @@ -7,7 +7,7 @@ class ZDNetBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'Technology News, Analysis, Comments and Product Reviews for IT Professionals.'; - $this->update = '2016-07-20'; + $this->update = '2016-08-06'; $this->parameters[] = // http://www.zdnet.com/zdnet.opml @@ -310,8 +310,4 @@ class ZDNetBridge extends BridgeAbstract { public function getURI() { return 'http://www.zdnet.com/'; } - - public function getCacheDuration() { - return 3600; //1 hour - } } diff --git a/bridges/ZoneTelechargementBridge.php b/bridges/ZoneTelechargementBridge.php index 07c29b7..d416dff 100644 --- a/bridges/ZoneTelechargementBridge.php +++ b/bridges/ZoneTelechargementBridge.php @@ -7,7 +7,7 @@ class ZoneTelechargementBridge extends BridgeAbstract { $this->name = $this->getName(); $this->uri = $this->getURI(); $this->description = 'RSS proxy returning the newest releases.
You may specify a category found in RSS URLs, else main feed is selected.'; - $this->update = "2016-03-16"; + $this->update = "2016-08-06"; $this->parameters[] = '[ @@ -51,8 +51,4 @@ class ZoneTelechargementBridge extends BridgeAbstract { public function getURI() { return 'https://www.zone-telechargement.com/'; } - - public function getCacheDuration() { - return 3600; - } }