From cfaa25f667cbb57572a6245866e8b48b9f37f25b Mon Sep 17 00:00:00 2001
From: Mathias Kresin <m@kresin.me>
Date: Fri, 9 Jan 2015 14:43:45 +0100
Subject: [PATCH] minor improvements

- enable debug logging for image proxy
- show enclosure image only if no article content exists
- do not store empty favicons
- fix typo in get_item_favicons (worked anyway since get_favicons
  returned all known favicons instead)
---
 models/feed.php         | 29 +++++++++++++++++------------
 models/proxy.php        |  8 ++++++--
 templates/show_item.php |  2 +-
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/models/feed.php b/models/feed.php
index 3783fe5..f3264bc 100644
--- a/models/feed.php
+++ b/models/feed.php
@@ -16,25 +16,30 @@ use PicoFeed\Client\InvalidUrlException;
 
 const LIMIT_ALL = -1;
 
-// Download and store the favicon
-function fetch_favicon($feed_id, $site_url)
+// Store the favicon
+function store_favicon($feed_id, $link, $icon)
 {
-    $favicon = new Favicon;
-
     return Database::get('db')
             ->table('favicons')
             ->save(array(
                 'feed_id' => $feed_id,
-                'link' => $favicon->find($site_url),
-                'icon' => $favicon->getDataUri(),
+                'link' => $link,
+                'icon' => $icon,
             ));
 }
 
-// Refresh favicon
-function refresh_favicon($feed_id, $site_url)
+// Download favicon
+function fetch_favicon($feed_id, $site_url)
 {
     if (Config\get('favicons') == 1 && ! has_favicon($feed_id)) {
-        fetch_favicon($feed_id, $site_url);
+        $favicon = new Favicon;
+
+        $link = $favicon->find($site_url);
+        $icon = $favicon->getDataUri();
+
+        if ($icon !== '') {
+            store_favicon($feed_id, $link, $icon);
+        }
     }
 }
 
@@ -63,7 +68,7 @@ function get_item_favicons(array $items)
     $feed_ids = array();
 
     foreach ($items as $item) {
-        $feeds_ids[] = $item['feed_id'];
+        $feed_ids[] = $item['feed_id'];
     }
 
     return get_favicons($feed_ids);
@@ -184,7 +189,7 @@ function create($url, $enable_grabber = false, $force_rtl = false)
             $feed_id = $db->getConnection()->getLastId();
 
             Item\update_all($feed_id, $feed->getItems());
-            refresh_favicon($feed_id, $feed->getSiteUrl());
+            fetch_favicon($feed_id, $feed->getSiteUrl());
 
             Config\write_debug();
 
@@ -256,7 +261,7 @@ function refresh($feed_id)
             update_cache($feed_id, $resource->getLastModified(), $resource->getEtag());
 
             Item\update_all($feed_id, $feed->getItems());
-            refresh_favicon($feed_id, $feed->getSiteUrl());
+            fetch_favicon($feed_id, $feed->getSiteUrl());
         }
 
         update_parsing_error($feed_id, 0);
diff --git a/models/proxy.php b/models/proxy.php
index 1badb22..8222101 100644
--- a/models/proxy.php
+++ b/models/proxy.php
@@ -13,12 +13,16 @@ function download($url)
         $client->setUserAgent(Config\HTTP_USER_AGENT);
         $client->execute($url);
 
-        return array(
+        $content = array(
             $client->getContent(),
             $client->getContentType(),
         );
     }
     catch (ClientException $e) {
-        return array(false, false);
+        $content = array(false, false);
     }
+
+    Config\write_debug();
+
+    return $content;
 }
diff --git a/templates/show_item.php b/templates/show_item.php
index d4efc37..3be4e2d 100644
--- a/templates/show_item.php
+++ b/templates/show_item.php
@@ -76,7 +76,7 @@
                     <video controls>
                         <source src="<?= $item['enclosure'] ?>" type="<?= $item['enclosure_type'] ?>">
                     </video>
-                <?php elseif (strpos($item['enclosure_type'], 'image') !== false): ?>
+                <?php elseif (strpos($item['enclosure_type'], 'image') !== false && $item['content'] === ''): ?>
                     <?php if ($image_proxy_enabled): ?>
                         <img src="?action=proxy&amp;url=<?= urlencode($item['enclosure']) ?>" alt="enclosure"/>
                     <?php else: ?>