Bugfixes

OleVik · Jan 16, 2019 · c1f3d5a · c1f3d5a
1 parent a2d5672
commit c1f3d5a
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# v3.3.4
+## 16-01-2019
+
+1. [](#bugfix)
+    * Silent fallback from file exists check
+    * Change filename-hash to use entire source-URL
+    * Fix config-reference in Parser
+2. [](#improved)
+    * Grav version requirement bump
+
 # v3.3.3
 ## 08-01-2019
 

diff --git a/Manifest.php b/Manifest.php
@@ -258,7 +258,7 @@ public function compare($manifest)
         }
         $feeds = array();
         foreach ($this->twigFeeds as $feed) {
-            $feeds[$feed['source']]['filename'] = hash('md5', parse_url($feed['source'], PHP_URL_HOST)) . '.json';
+            $feeds[$feed['source']]['filename'] = hash('md5', $feed['source']) . '.json';
             if (isset($feed['name'])) {
                 $feeds[$feed['source']]['name'] = $feed['name'];
             }
@@ -284,15 +284,12 @@ public function compare($manifest)
                 $feeds[$feed['source']]['extra_tags'] = $feed['extra_tags'];
             }
         }
-        $return = array(
-            'state' => ''
-        );
+        $return = array('state' => '');
         if ($manifest['data'] == $feeds) {
             $return['state'] = 'unchanged';
-            return $return;
         } else {
             $return['state'] = 'changed';
-            return $return;
         }
+        return $return;
     }
 }
diff --git a/Parser.php b/Parser.php
@@ -52,6 +52,9 @@ public function __construct($config)
      */
     public function readFeed($file)
     {
+        if (!file_exists($file)) {
+            return false;
+        }
         $feed = file_get_contents($file);
         $json = json_decode($feed, true);
         return $json;
@@ -85,7 +88,7 @@ public function parseFeed($args, $path = false)
                     $resource = $reader->download($args['source']);
                 }
             } catch (InvalidCertificateException $e) {
-                if ($this->config['silence_security'] === false) {
+                if ($this->config['silence_security'] != 'true') {
                     throw new \Exception($e);
                 }
             }

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Twig Feeds
-version: 3.3.3
+version: 3.3.4
 description: "Parse RSS and Atom feeds with Twig."
 icon: feed
 author:
@@ -11,7 +11,7 @@ keywords: avatar, avatars, identicon, identicons
 bugs: https://github.com/olevik/grav-plugin-twigfeeds/issues
 license: MIT
 dependencies:
-  - { name: grav, version: '>=1.1.17' }
+  - { name: grav, version: '>=1.5.6' }
 
 form:
   validation: loose

diff --git a/twigfeeds.php b/twigfeeds.php
@@ -251,7 +251,11 @@ public function outputFeeds()
             foreach ($content['data'] as $source => $data) {
                 $filename = $config['cache_path'] . $data['filename'];
                 $content = $parser->readFeed($filename);
-                $feed_items[$content['name']] = $content;
+                if ($content) {
+                    $feed_items[$content['name']] = $content;
+                } else {
+                    $debug ? $this->debug('Could not find ' . $filename . ', continuing') : null;
+                }
             }
         } else {
             foreach ($config['twig_feeds'] as $feed) {