oldrecorded | k(endtime) k(title) k(seriesid) k(programid)
pk(station,starttime,title)
@@ -2370,13 +2368,6 @@ bool InitializeMythSchema(void)
"Inserting MythTV initial database information.");
const char *updates[] = {
-"CREATE TABLE callsignnetworkmap ("
-" id int(11) NOT NULL AUTO_INCREMENT,"
-" callsign varchar(20) NOT NULL DEFAULT '',"
-" network varchar(20) NOT NULL DEFAULT '',"
-" PRIMARY KEY (id),"
-" UNIQUE KEY callsign (callsign)"
-") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
"CREATE TABLE capturecard ("
" cardid int(10) unsigned NOT NULL AUTO_INCREMENT,"
" videodevice varchar(128) DEFAULT NULL,"
@@ -2871,13 +2862,6 @@ bool InitializeMythSchema(void)
" PRIMARY KEY (logid),"
" KEY module (module)"
") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
-"CREATE TABLE networkiconmap ("
-" id int(11) NOT NULL AUTO_INCREMENT,"
-" network varchar(20) NOT NULL DEFAULT '',"
-" url varchar(255) NOT NULL DEFAULT '',"
-" PRIMARY KEY (id),"
-" UNIQUE KEY network (network)"
-") ENGINE=MyISAM DEFAULT CHARSET=utf8;",
"CREATE TABLE oldfind ("
" recordid int(11) NOT NULL DEFAULT '0',"
" findid int(11) NOT NULL DEFAULT '0',"
diff --git a/mythtv/programs/mythfilldatabase/commandlineparser.cpp b/mythtv/programs/mythfilldatabase/commandlineparser.cpp
index 9f65650d70c..02aa2cbe60a 100644
--- a/mythtv/programs/mythfilldatabase/commandlineparser.cpp
+++ b/mythtv/programs/mythfilldatabase/commandlineparser.cpp
@@ -190,19 +190,6 @@ void MythFillDatabaseCommandLineParser::LoadArguments(void)
"channel lineup.")
->SetGroup("Channel List Handling");
add("--no-mark-repeats", "markrepeats", true, "do not mark repeats", "");
- add("--export-icon-map", "exporticonmap", "iconmap.xml",
- "export icon map to file", "")
- ->SetGroup("Channel Icon Handling");
- add("--import-icon-map", "importiconmap", "iconmap.xml",
- "import icon map to file", "")
- ->SetGroup("Channel Icon Handling");
- add("--update-icon-map", "updateiconmap", false,
- "updates icon map icons", "")
- ->SetGroup("Channel Icon Handling");
- add("--reset-icon-map", "reseticonmap", "", "resets icon maps",
- "Reset all icon maps. If given 'all' as an optional value, reset "
- "channel icons as well.")
- ->SetGroup("Channel Icon Handling");
add("--graboptions", "graboptions", "", "", "")
->SetRemoved("mythfilldatabase now passes any text after an\n"
diff --git a/mythtv/programs/mythfilldatabase/filldata.cpp b/mythtv/programs/mythfilldatabase/filldata.cpp
index 8fa02f13a19..8f52c26eb68 100644
--- a/mythtv/programs/mythfilldatabase/filldata.cpp
+++ b/mythtv/programs/mythfilldatabase/filldata.cpp
@@ -101,7 +101,7 @@ void FillData::SetRefresh(int day, bool set)
}
// DataDirect stuff
-void FillData::DataDirectStationUpdate(Source source, bool update_icons)
+void FillData::DataDirectStationUpdate(Source source)
{
DataDirectProcessor::UpdateStationViewTable(source.lineupid);
@@ -117,9 +117,6 @@ void FillData::DataDirectStationUpdate(Source source, bool update_icons)
}
// TODO delete any channels which no longer exist in listings source
- if (update_icons)
- icon_data.UpdateSourceIcons(source.id);
-
// Unselect channels not in users lineup for DVB, HDTV
if (!insert_channels && (new_channels > 0) &&
is_grabber_labs(source.xmltvgrabber))
@@ -179,7 +176,7 @@ bool FillData::DataDirectUpdateChannels(Source source)
}
if (ok)
- DataDirectStationUpdate(source, false);
+ DataDirectStationUpdate(source);
return ok;
}
@@ -332,7 +329,6 @@ bool FillData::GrabDataFromFile(int id, QString &filename)
return false;
chan_data.handleChannels(id, &chanlist);
- icon_data.UpdateSourceIcons(id);
if (proglist.count() == 0)
{
LOG(VB_GENERAL, LOG_INFO, "No programs found in data.");
diff --git a/mythtv/programs/mythfilldatabase/filldata.h b/mythtv/programs/mythfilldatabase/filldata.h
index d9a5592537a..fcdf00dba0a 100644
--- a/mythtv/programs/mythfilldatabase/filldata.h
+++ b/mythtv/programs/mythfilldatabase/filldata.h
@@ -15,7 +15,6 @@ using namespace std;
// filldata headers
#include "channeldata.h"
#include "xmltvparser.h"
-#include "icondata.h"
#define REFRESH_MAX 21
@@ -59,7 +58,7 @@ class FillData
void SetRefresh(int day, bool set);
- void DataDirectStationUpdate(Source source, bool update_icons = true);
+ void DataDirectStationUpdate(Source source);
bool DataDirectUpdateChannels(Source source);
bool GrabDDData(Source source, int poffset,
QDate pdate, int ddSource);
@@ -79,7 +78,6 @@ class FillData
ProgramData prog_data;
ChannelData chan_data;
XMLTVParser xmltv_parser;
- IconData icon_data;
DataDirectProcessor ddprocessor;
QString logged_in;
diff --git a/mythtv/programs/mythfilldatabase/icondata.cpp b/mythtv/programs/mythfilldatabase/icondata.cpp
deleted file mode 100644
index ade373cfd22..00000000000
--- a/mythtv/programs/mythfilldatabase/icondata.cpp
+++ /dev/null
@@ -1,560 +0,0 @@
-// C++ headers
-#include
-using namespace std;
-
-// C headers
-#include
-
-// POSIX headers
-#include
-
-// Qt headers
-#include
-#include
-#include
-#include
-#include
-
-// MythTV headers
-#include "mythcorecontext.h"
-#include "mythtimer.h"
-#include "mythdb.h"
-
-// filldata headers
-#include "fillutil.h"
-#include "icondata.h"
-
-#define LOC QString("IconData: ")
-#define LOC_WARN QString("IconData, Warning: ")
-#define LOC_ERR QString("IconData, Error: ")
-
-const char * const IM_DOC_TAG = "iconmappings";
-
-const char * const IM_CS_TO_NET_TAG = "callsigntonetwork";
-const char * const IM_CS_TAG = "callsign";
-
-const char * const IM_NET_TAG = "network";
-
-const char * const IM_NET_TO_URL_TAG = "networktourl";
-const char * const IM_NET_URL_TAG = "url";
-
-const char * const BASEURLMAP_START = "mythfilldatabase.urlmap.";
-
-const char * const IM_BASEURL_TAG = "baseurl";
-const char * const IM_BASE_STUB_TAG = "stub";
-
-class DOMException
-{
- private:
- QString message;
-
- protected:
- void setMessage(const QString &mes)
- {
- message = mes;
- }
-
- public:
- DOMException() : message("Unknown DOMException") {}
- virtual ~DOMException() {}
- DOMException(const QString &mes) : message(mes) {}
- QString getMessage() const { return message; }
-};
-
-class DOMBadElementConversion : public DOMException
-{
- public:
- DOMBadElementConversion()
- {
- setMessage("Unknown DOMBadElementConversion");
- }
- DOMBadElementConversion(const QString &mes) : DOMException(mes) {}
- DOMBadElementConversion(const QDomNode &node)
- {
- setMessage(QString("Unable to convert node: '%1' to QDomElement.")
- .arg(node.nodeName()));
- }
-};
-
-class DOMUnknownChildElement : public DOMException
-{
- public:
- DOMUnknownChildElement()
- {
- setMessage("Unknown DOMUnknownChildElement");
- }
- DOMUnknownChildElement(const QString &mes) : DOMException(mes) {}
- DOMUnknownChildElement(const QDomElement &e, QString child_name)
- {
- setMessage(QString("Unknown child element '%1' of: '%2'")
- .arg(child_name)
- .arg(e.tagName()));
- }
-};
-
-static QDomElement nodeToElement(QDomNode &node)
-{
- QDomElement retval = node.toElement();
- if (retval.isNull())
- {
- throw DOMBadElementConversion(node);
- }
- return retval;
-}
-
-static QString expandURLString(const QString &url)
-{
- QRegExp expandtarget("\\[([^\\]]+)\\]");
- QString retval = url;
-
- int found_at = 0;
- int start_index = 0;
- while (found_at != -1)
- {
- found_at = expandtarget.indexIn(retval, start_index);
- if (found_at != -1)
- {
- QString no_mapping("no_URL_mapping");
- QString search_string = expandtarget.cap(1);
- QString expanded_text = gCoreContext->GetSetting(
- QString(BASEURLMAP_START) + search_string, no_mapping);
- if (expanded_text != no_mapping)
- {
- retval.replace(found_at, expandtarget.matchedLength(),
- expanded_text);
- }
- else
- {
- start_index = found_at + expandtarget.matchedLength();
- }
- }
- }
-
- return retval;
-}
-
-static QString getNamedElementText(const QDomElement &e,
- const QString &child_element_name)
-{
- QDomNode child_node = e.namedItem(child_element_name);
- if (child_node.isNull())
- {
- throw DOMUnknownChildElement(e, child_element_name);
- }
- QDomElement element = nodeToElement(child_node);
- return element.text();
-}
-
-static void RunSimpleQuery(const QString &query)
-{
- MSqlQuery q(MSqlQuery::InitCon());
- if (!q.exec(query))
- MythDB::DBError("RunSimpleQuery ", q);
-}
-
-
-IconData::~IconData()
-{
- MythHttpPool::GetSingleton()->RemoveListener(this);
-}
-
-void IconData::UpdateSourceIcons(uint sourceid)
-{
- LOG(VB_GENERAL, LOG_INFO, LOC +
- QString("Updating icons for sourceid: %1").arg(sourceid));
-
- QString fileprefix = SetupIconCacheDirectory();
-
- MSqlQuery query(MSqlQuery::InitCon());
- query.prepare(
- "SELECT ch.chanid, nim.url "
- "FROM (channel ch, callsignnetworkmap csm) "
- "RIGHT JOIN networkiconmap nim ON csm.network = nim.network "
- "WHERE ch.callsign = csm.callsign AND "
- " icon = '' AND "
- " ch.sourceid = :SOURCEID");
- query.bindValue(":SOURCEID", sourceid);
-
- if (!query.exec())
- {
- MythDB::DBError("Looking for icons to fetch", query);
- return;
- }
-
- unsigned int count = 0;
- while (query.next())
- {
- count++;
-
- QString icon_url = expandURLString(query.value(1).toString());
- QFileInfo qfi(icon_url);
- QFile localfile(fileprefix + "/" + qfi.fileName());
-
- if (!localfile.exists() || 0 == localfile.size())
- {
- LOG(VB_GENERAL, LOG_INFO, LOC +
- QString("Attempting to fetch icon at '%1'") .arg(icon_url));
-
- FI fi;
- fi.filename = localfile.fileName();
- fi.chanid = query.value(0).toUInt();
-
- bool add_request = false;
- {
- QMutexLocker locker(&m_u2fl_lock);
- add_request = m_u2fl[icon_url].empty();
- m_u2fl[icon_url].push_back(fi);
- }
-
- if (add_request)
- MythHttpPool::GetSingleton()->AddUrlRequest(icon_url, this);
-
- // HACK -- begin
- // This hack is needed because we don't enter the event loop
- // before running this code via qApp->exec()
- qApp->processEvents();
- // HACK -- end
- }
- }
-
- MythTimer tm; tm.start();
- while (true)
- {
- // HACK -- begin
- // This hack is needed because we don't enter the event loop
- // before running this code via qApp->exec()
- qApp->processEvents();
- // HACK -- end
-
- QMutexLocker locker(&m_u2fl_lock);
- if (m_u2fl.empty())
- break;
-
- if ((uint)tm.elapsed() > (count * 500) + 2000)
- {
- LOG(VB_GENERAL, LOG_WARNING, LOC +
- "Timed out waiting for some icons to download, "
- "you may wish to try again later.");
- break;
- }
- }
-}
-
-void IconData::Update(
- QHttp::Error error,
- const QString &error_str,
- const QUrl &url,
- uint http_status_id,
- const QString &http_status_str,
- const QByteArray &data)
-{
- bool http_error = false;
- if (QHttp::NoError != error)
- {
- LOG(VB_GENERAL, LOG_ERR, LOC + QString("fetching '%1'\n\t\t\t%2")
- .arg(url.toString()).arg(error_str));
- http_error = true;
- }
-
- if (!data.size())
- {
- LOG(VB_GENERAL, LOG_ERR, LOC + QString("Did not get any data from '%1'")
- .arg((url.toString())));
- http_error = true;
- }
-
- FIL fil;
- {
- QMutexLocker locker(&m_u2fl_lock);
- Url2FIL::iterator it = m_u2fl.find(url);
- if (it == m_u2fl.end())
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("Programmer Error, got data for '%1',"
- "but have no record of requesting it.")
- .arg(url.toString()));
- return;
- }
-
- fil = *it;
- m_u2fl.erase(it);
- }
-
- while (!http_error && !fil.empty())
- {
- Save(fil.back(), data);
- fil.pop_back();
- }
-}
-
-bool IconData::Save(const FI &fi, const QByteArray &data)
-{
- QFile file(fi.filename);
- if (!file.open(QIODevice::WriteOnly))
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("Failed to open '%1' for writing") .arg(fi.filename));
- return false;
- }
-
- if (file.write(data) < data.size())
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("Failed to write icon data to '%1'") .arg(fi.filename));
- file.remove();
- return false;
- }
-
- file.flush();
-
- LOG(VB_GENERAL, LOG_INFO, LOC +
- QString("Updating channel icon for chanid: %1").arg(fi.chanid));
-
- MSqlQuery update(MSqlQuery::InitCon());
- update.prepare(
- "UPDATE channel SET icon = :ICON "
- "WHERE chanid = :CHANID");
-
- update.bindValue(":ICON", fi.filename);
- update.bindValue(":CHANID", fi.chanid);
-
- if (!update.exec())
- {
- MythDB::DBError("Setting the icon file name", update);
- return false;
- }
-
- return true;
-}
-
-void IconData::ImportIconMap(const QString &filename)
-{
- LOG(VB_GENERAL, LOG_INFO, LOC +
- QString("Importing icon mapping from %1...").arg(filename));
-
- QFile xml_file;
-
- if (dash_open(xml_file, filename, QIODevice::ReadOnly))
- {
- QDomDocument doc;
- QString de_msg;
- int de_ln = 0;
- int de_column = 0;
- if (doc.setContent(&xml_file, false, &de_msg, &de_ln, &de_column))
- {
- MSqlQuery nm_query(MSqlQuery::InitCon());
- nm_query.prepare("REPLACE INTO networkiconmap(network, url) "
- "VALUES(:NETWORK, :URL)");
- MSqlQuery cm_query(MSqlQuery::InitCon());
- cm_query.prepare("REPLACE INTO callsignnetworkmap(callsign, "
- "network) VALUES(:CALLSIGN, :NETWORK)");
- MSqlQuery su_query(MSqlQuery::InitCon());
- su_query.prepare("UPDATE settings SET data = :URL "
- "WHERE value = :STUBNAME");
- MSqlQuery si_query(MSqlQuery::InitCon());
- si_query.prepare("INSERT INTO settings(value, data) "
- "VALUES(:STUBNAME, :URL)");
-
- QDomElement element = doc.documentElement();
-
- QDomNode node = element.firstChild();
- while (!node.isNull())
- {
- try
- {
- QDomElement e = nodeToElement(node);
- if (e.tagName() == IM_NET_TO_URL_TAG)
- {
- QString net = getNamedElementText(e, IM_NET_TAG);
- QString u = getNamedElementText(e, IM_NET_URL_TAG);
-
- nm_query.bindValue(":NETWORK", net.trimmed());
- nm_query.bindValue(":URL", u.trimmed());
- if (!nm_query.exec())
- MythDB::DBError(
- "Inserting network->url mapping", nm_query);
- }
- else if (e.tagName() == IM_CS_TO_NET_TAG)
- {
- QString cs = getNamedElementText(e, IM_CS_TAG);
- QString net = getNamedElementText(e, IM_NET_TAG);
-
- cm_query.bindValue(":CALLSIGN", cs.trimmed());
- cm_query.bindValue(":NETWORK", net.trimmed());
- if (!cm_query.exec())
- MythDB::DBError("Inserting callsign->network "
- "mapping", cm_query);
- }
- else if (e.tagName() == IM_BASEURL_TAG)
- {
- MSqlQuery *qr = &si_query;
-
- QString st(BASEURLMAP_START);
- st += getNamedElementText(e, IM_BASE_STUB_TAG);
- QString u = getNamedElementText(e, IM_NET_URL_TAG);
-
- MSqlQuery qc(MSqlQuery::InitCon());
- qc.prepare("SELECT COUNT(*) FROM settings "
- "WHERE value = :STUBNAME");
- qc.bindValue(":STUBNAME", st);
- if (qc.exec() && qc.next())
- {
- if (qc.value(0).toInt() != 0)
- {
- qr = &su_query;
- }
- }
-
- qr->bindValue(":STUBNAME", st);
- qr->bindValue(":URL", u);
-
- if (!qr->exec())
- MythDB::DBError(
- "Inserting callsign->network mapping", *qr);
- }
- }
- catch (DOMException &e)
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("while processing %1: %2")
- .arg(node.nodeName()).arg(e.getMessage()));
- }
- node = node.nextSibling();
- }
- }
- else
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("unable to set document content: %1:%2c%3 %4")
- .arg(filename).arg(de_ln).arg(de_column).arg(de_msg));
- }
- }
- else
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("unable to open '%1' for reading.").arg(filename));
- }
-}
-
-void IconData::ExportIconMap(const QString &filename)
-{
- LOG(VB_GENERAL, LOG_INFO, LOC +
- QString("Exporting icon mapping to '%1'").arg(filename));
-
- QFile xml_file(filename);
- if (dash_open(xml_file, filename, QIODevice::WriteOnly))
- {
- QTextStream os(&xml_file);
- os << "\n";
- os << "\n";
-
- QDomDocument iconmap;
- QDomElement roote = iconmap.createElement(IM_DOC_TAG);
-
- MSqlQuery query(MSqlQuery::InitCon());
-
- query.prepare("SELECT * FROM callsignnetworkmap ORDER BY callsign;");
- if (query.exec())
- {
- while (query.next())
- {
- QDomElement cs2nettag = iconmap.createElement(IM_CS_TO_NET_TAG);
- QDomElement cstag = iconmap.createElement(IM_CS_TAG);
- QDomElement nettag = iconmap.createElement(IM_NET_TAG);
- QDomText cs_text = iconmap.createTextNode(
- query.value(1).toString());
- QDomText net_text = iconmap.createTextNode(
- query.value(2).toString());
-
- cstag.appendChild(cs_text);
- nettag.appendChild(net_text);
-
- cs2nettag.appendChild(cstag);
- cs2nettag.appendChild(nettag);
-
- roote.appendChild(cs2nettag);
- }
- }
-
- query.prepare("SELECT * FROM networkiconmap ORDER BY network;");
- if (query.exec())
- {
- while (query.next())
- {
- QDomElement net2urltag = iconmap.createElement(
- IM_NET_TO_URL_TAG);
- QDomElement nettag = iconmap.createElement(IM_NET_TAG);
- QDomElement urltag = iconmap.createElement(IM_NET_URL_TAG);
- QDomText net_text = iconmap.createTextNode(
- query.value(1).toString());
- QDomText url_text = iconmap.createTextNode(
- query.value(2).toString());
-
- nettag.appendChild(net_text);
- urltag.appendChild(url_text);
-
- net2urltag.appendChild(nettag);
- net2urltag.appendChild(urltag);
-
- roote.appendChild(net2urltag);
- }
- }
-
- query.prepare("SELECT value,data FROM settings WHERE value "
- "LIKE :URLMAP");
- query.bindValue(":URLMAP", QString(BASEURLMAP_START) + "%");
- if (query.exec())
- {
- QRegExp baseax("\\.([^\\.]+)$");
- while (query.next())
- {
- QString base_stub = query.value(0).toString();
- if (baseax.indexIn(base_stub) != -1)
- {
- base_stub = baseax.cap(1);
- }
-
- QDomElement baseurltag = iconmap.createElement(IM_BASEURL_TAG);
- QDomElement stubtag = iconmap.createElement(
- IM_BASE_STUB_TAG);
- QDomElement urltag = iconmap.createElement(IM_NET_URL_TAG);
- QDomText base_text = iconmap.createTextNode(base_stub);
- QDomText url_text = iconmap.createTextNode(
- query.value(1).toString());
-
- stubtag.appendChild(base_text);
- urltag.appendChild(url_text);
-
- baseurltag.appendChild(stubtag);
- baseurltag.appendChild(urltag);
-
- roote.appendChild(baseurltag);
- }
- }
-
- iconmap.appendChild(roote);
- iconmap.save(os, 4);
- }
- else
- {
- LOG(VB_GENERAL, LOG_ERR, LOC +
- QString("unable to open '%1' for writing.").arg(filename));
- }
-}
-
-void IconData::ResetIconMap(bool reset_icons)
-{
- MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("DELETE FROM settings WHERE value LIKE :URLMAPLIKE");
- query.bindValue(":URLMAPLIKE", QString(BASEURLMAP_START) + '%');
- if (!query.exec())
- MythDB::DBError("ResetIconMap", query);
-
- RunSimpleQuery("TRUNCATE TABLE callsignnetworkmap;");
- RunSimpleQuery("TRUNCATE TABLE networkiconmap");
-
- if (reset_icons)
- {
- RunSimpleQuery("UPDATE channel SET icon = ''");
- }
-}
diff --git a/mythtv/programs/mythfilldatabase/icondata.h b/mythtv/programs/mythfilldatabase/icondata.h
deleted file mode 100644
index 76aa88c1c96..00000000000
--- a/mythtv/programs/mythfilldatabase/icondata.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef _ICONMAP_H_
-#define _ICONMAP_H_
-
-#include
-using namespace std;
-
-#include
-#include
-#include
-
-#include "mythhttppool.h"
-
-class IconData : private MythHttpListener
-{
- public:
- IconData() {}
- ~IconData();
-
- void UpdateSourceIcons(uint sourceid);
- void ImportIconMap(const QString &filename);
- void ExportIconMap(const QString &filename);
- void ResetIconMap(bool reset_icons);
-
- private:
- class FI { public: QString filename; uint chanid; };
- typedef vector FIL;
- typedef QMap Url2FIL;
-
- // Implements MythHttpListener
- virtual void Update(QHttp::Error error,
- const QString &error_str,
- const QUrl &url,
- uint http_status_id,
- const QString &http_status_str,
- const QByteArray &data);
-
- bool Save(const FI &fi, const QByteArray &data);
-
- QMutex m_u2fl_lock;
- Url2FIL m_u2fl;
-};
-
-#endif // _ICONMAP_H_
diff --git a/mythtv/programs/mythfilldatabase/main.cpp b/mythtv/programs/mythfilldatabase/main.cpp
index 37145c8bc57..ebd7a9ba482 100644
--- a/mythtv/programs/mythfilldatabase/main.cpp
+++ b/mythtv/programs/mythfilldatabase/main.cpp
@@ -72,15 +72,6 @@ int main(int argc, char *argv[])
bool usingDataDirect = false;
bool grab_data = true;
- bool export_iconmap = false;
- bool import_iconmap = false;
- bool reset_iconmap = false;
- bool reset_iconmap_icons = false;
- QString import_icon_data_filename("iconmap.xml");
- QString export_icon_data_filename("iconmap.xml");
-
- bool update_icon_data = false;
-
bool from_dd_file = false;
int sourceid = -1;
QString fromddfile_lineupid;
@@ -305,22 +296,6 @@ int main(int argc, char *argv[])
fill_data.only_update_channels = true;
mark_repeats = cmdline.toBool("markrepeats");
- if (cmdline.toBool("exporticonmap"))
- export_icon_data_filename = cmdline.toString("exporticonmap");
- if (cmdline.toBool("importiconmap"))
- import_icon_data_filename = cmdline.toString("importiconmap");
- if (cmdline.toBool("updateiconmap"))
- {
- update_icon_data = true;
- grab_data = false;
- }
- if (cmdline.toBool("reseticonmap"))
- {
- reset_iconmap = true;
- grab_data = false;
- if (cmdline.toString("reseticonmap") == "all")
- reset_iconmap_icons = true;
- }
CleanupGuard callCleanup(cleanup);
@@ -479,35 +454,6 @@ int main(int argc, char *argv[])
return GENERIC_EXIT_OK;
}
- if (reset_iconmap)
- {
- fill_data.icon_data.ResetIconMap(reset_iconmap_icons);
- }
-
- if (import_iconmap)
- {
- fill_data.icon_data.ImportIconMap(import_icon_data_filename);
- }
-
- if (export_iconmap)
- {
- fill_data.icon_data.ExportIconMap(export_icon_data_filename);
- }
-
- if (update_icon_data)
- {
- MSqlQuery query(MSqlQuery::InitCon());
- query.prepare("SELECT sourceid FROM videosource ORDER BY sourceid");
- if (!query.exec())
- {
- MythDB::DBError("Querying sources", query);
- return GENERIC_EXIT_DB_ERROR;
- }
-
- while (query.next())
- fill_data.icon_data.UpdateSourceIcons(query.value(0).toInt());
- }
-
if (grab_data)
{
LOG(VB_GENERAL, LOG_INFO, "Adjusting program database end times.");
diff --git a/mythtv/programs/mythfilldatabase/mythfilldatabase.pro b/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
index dfb0a90b21a..e6d99de2307 100644
--- a/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
+++ b/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
@@ -18,9 +18,8 @@ DEPENDPATH += ../../libs/libmythtv/mpeg
# Input
HEADERS += filldata.h channeldata.h
-HEADERS += icondata.h xmltvparser.h
+HEADERS += xmltvparser.h
HEADERS += fillutil.h commandlineparser.h
SOURCES += filldata.cpp channeldata.cpp
-SOURCES += icondata.cpp xmltvparser.cpp
-SOURCES += fillutil.cpp
+SOURCES += xmltvparser.cpp fillutil.cpp
SOURCES += main.cpp commandlineparser.cpp
diff --git a/mythtv/programs/scripts/database/mythconverg_restore.pl b/mythtv/programs/scripts/database/mythconverg_restore.pl
index a2f7e460006..0869534e499 100755
--- a/mythtv/programs/scripts/database/mythconverg_restore.pl
+++ b/mythtv/programs/scripts/database/mythconverg_restore.pl
@@ -1580,7 +1580,7 @@
# previous DB schema updates if the user is running a restore
# script from an older version of MythTV, but the extra data will
# only take a bit of hard drive space.
- @partial_restore_tables = ('callsignnetworkmap',
+ @partial_restore_tables = ('callsignnetworkmap', # historic
'capturecard',
'cardinput',
'channel',
@@ -1617,7 +1617,7 @@
'keybindings',
'keyword',
'mythlog',
- 'networkiconmap',
+ 'networkiconmap', # historic
'oldfind',
'oldprogram',
'people',
|