Ticket #11019: 0002-Cache-Channelicons-in-local-folder-026.patch

mythtv/libs/libmythtv/dbchannelinfo.cpp

@@ -102 +102 @@
 ////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////
 
+bool DBChannel::CacheChannelIcon(void)
+{
+    if (icon.isEmpty())
+        return false;
+
+    m_localIcon = icon;
+
+    // Is icon local?
+    if (QFile(icon).exists())
+        return true;
+
+    QString localDirStr = QString("%1/channels").arg(GetConfDir());
+    QDir localDir(localDirStr);
+
+    if (!localDir.exists() && !localDir.mkdir(localDirStr))
+    {
+        LOG(VB_GENERAL, LOG_ERR,
+            QString("Icons directory is missing and could not be created: %1")
+                .arg(localDirStr));
+        icon.clear();
+        return false;
+    }
+
+    // Has it been saved to the local cache?
+    m_localIcon = QString("%1/%2").arg(localDirStr)
+                                 .arg(QFileInfo(icon).fileName());
+    if (QFile(m_localIcon).exists())
+        return true;
+
+    // Get address of master backed
+    QString url = gCoreContext->GetMasterHostPrefix("ChannelIcons",
+                                                                                icon);
+    if (url.length() < 1)
+    {
+        icon.clear();
+        return false;
+    }
+
+    QUrl qurl = url;
+    if (qurl.host().isEmpty())
+    {
+        icon.clear();
+        return false;
+    }
+
+    RemoteFile *rf = new RemoteFile(url, false, false, 0);
+
+    QByteArray data;
+    bool ret = rf->SaveAs(data);
+
+    delete rf;
+
+    if (ret && data.size())
+    {
+        QImage image;
+
+        image.loadFromData(data);
+
+        //if (image.loadFromData(data) && image.width() > 0
+
+        if (image.save(m_localIcon))
+        {
+            LOG(VB_GENERAL, LOG_INFO,
+                QString("Caching channel icon %1").arg(m_localIcon));
+            return true;
+        }
+        else
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("Failed to save to %1").arg(m_localIcon));
+    }
+
+    // if we get here then the icon is set in the db but couldn't be found
+    // anywhere so maybe we should remove it from the DB?
+    icon.clear();
+
+    return false;
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+
 QString ChannelInfo::GetFormatted(const ChannelFormat &format) const
 {
     QString tmp;

mythtv/libs/libmythtv/dbchannelinfo.h

@@ -33 +33 @@
     bool operator == (uint _chanid) const
         { return chanid == _chanid; }
 
+    bool CacheChannelIcon(void);
+
     enum ChannelFormat { kChannelShort, kChannelLong };
     QString GetFormatted(const ChannelFormat &format) const;
     void ToMap(InfoMap &infoMap) const;
@@ -42 +44 @@
     QString callsign;
     QString name;
     QString icon;
+    QString m_localIcon;
     uint    chanid;
     uint    major_chan;
     uint    minor_chan;

mythtv/libs/libmythtv/osd.cpp

@@ -4 +4 @@
 // libmyth
 #include "mythlogging.h"
 
+// libmythbase
+#include "mythdirs.h"
+
 // libmythui
 #include "mythmainwindow.h"
 #include "mythuihelper.h"
@@ -436 +439 @@
                 iconpath = map["iconpath"];
             else
                 iconpath = ChannelUtil::GetIcon(chanid);
+                
+                QString localIcon = QString("%1/channels/%2").arg(GetConfDir())
+                                                .arg(QFileInfo(iconpath).fileName());
 
-            if (!iconpath.isEmpty())
-            {
-                QString iconurl =
-                                gCoreContext->GetMasterHostPrefix("ChannelIcons",
-                                                                  iconpath);
 
-                icon->SetFilename(iconurl);
+            if (QFile(localIcon).exists())
+            {
+                icon->SetFilename(localIcon);
                 icon->Load(false);
             }
         }

mythtv/programs/mythfilldatabase/icondata.cpp

@@ -316 +316 @@
         "UPDATE channel SET icon = :ICON "
         "WHERE chanid = :CHANID");
 
-    update.bindValue(":ICON",     fi.filename);
+    update.bindValue(":ICON", QFileInfo(fi.filename).fileName());
     update.bindValue(":CHANID",   fi.chanid);
 
     if (!update.exec())

mythtv/programs/mythfrontend/guidegrid.cpp

@@ -1576 +1576 @@
             chinfo->ToMap(infomap);
             item->SetTextFromMap(infomap);
 
-            if (!chinfo->icon.isEmpty())
+            if (!chinfo->icon.isEmpty() &&
+                chinfo->CacheChannelIcon())
             {
-                QString iconurl =
-                                gCoreContext->GetMasterHostPrefix("ChannelIcons",
-                                                                  chinfo->icon);
-                item->SetImage(iconurl, "channelicon");
+                QString localpath = chinfo->m_localIcon;
+                item->SetImage(localpath, "channelicon");
             }
         }
     }
@@ -1613 +1612 @@
         m_channelImage->Reset();
         if (!chinfo->icon.isEmpty())
         {
-            QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcons",
-                                                                chinfo->icon);
-
-            m_channelImage->SetFilename(iconurl);
-            m_channelImage->Load();
+            if (chinfo->CacheChannelIcon())
+            {
+                QString localpath = chinfo->m_localIcon;
+                m_channelImage->SetFilename(localpath);
+                m_channelImage->Load();
+            }
         }
     }
 

mythtv/programs/mythtv-setup/channeleditor.cpp

@@ -4 +4 @@
 // MythTV
 #include "mythprogressdialog.h"
 #include "mythuibuttonlist.h"
+#include "mythcorecontext.h"
 #include "channelsettings.h"
 #include "transporteditor.h"
 #include "mythuicheckbox.h"
@@ -210 +211 @@
         QString iconpath = item->GetImageFilename();
         if (!iconpath.isEmpty())
         {
-            m_preview->SetFilename(iconpath);
+            QString iconurl = gCoreContext->GetMasterHostPrefix("ChannelIcons",
+                                                               iconpath);
+
+            m_preview->SetFilename(iconurl);
             m_preview->Load();
         }
     }
@@ -336 +340 @@
             item->SetText(callsign, "callsign");
             item->SetText(sourceid, "sourcename");
             item->SetImage(icon);
-            item->SetImage(icon, "icon");
+            if (!icon.isEmpty())
+            {
+                QString iconurl =
+                                gCoreContext->GetMasterHostPrefix("ChannelIcons",
+                                                                        icon);
+                item->SetImage(iconurl, "icon");
+            }
             item->DisplayState(state, "status");
         }
     }

mythtv/programs/mythtv-setup/importicons.cpp

@@ -553 +553 @@
                         "WHERE chanid = :CHANID";
 
         query.prepare(qstr);
-        query.bindValue(":ICON", file.absoluteFilePath());
+        query.bindValue(":ICON", file.fileName());
         query.bindValue(":CHANID", localChanId);
 
         if (!query.exec())