Merge branch 'master' into mythtv-rec2

MythTV · Jul 23, 2011 · fc52dd8 · fc52dd8
2 parents 7858738 + 1c9f280
commit fc52dd8
Show file tree

Hide file tree

Showing 74 changed files with 3,566 additions and 1,282 deletions.
diff --git a/mythplugins/mythbrowser/mythbrowser/main.cpp b/mythplugins/mythbrowser/mythbrowser/main.cpp
@@ -20,7 +20,7 @@
 using namespace std;
 
 static int handleMedia(const QString &url, const QString &directory, const QString &filename,
-                       const QString &, const QString &, int, int, int, const QString &)
+                       const QString &, const QString &, int, int, const QString &, int, const QString &)
 {
     if (url.isEmpty())
     {

diff --git a/mythplugins/mythnews/mythnews/mythnews.cpp b/mythplugins/mythnews/mythnews/mythnews.cpp
@@ -69,9 +69,6 @@ MythNews::MythNews(MythScreenStack *parent, QString name) :
     m_TimerTimeout = 10*60*1000;
     m_httpGrabber = NULL;
 
-    m_timeFormat = gCoreContext->GetSetting("TimeFormat", "h:mm AP");
-    m_dateFormat = gCoreContext->GetSetting("DateFormat", "ddd MMMM d");
-
     // Now do the actual work
     m_RetrieveTimer = new QTimer(this);
     connect(m_RetrieveTimer, SIGNAL(timeout()),
@@ -150,11 +147,11 @@ void MythNews::clearSites(void)
     m_articles.clear();
     m_articlesList->Reset();
 
-    m_titleText->SetText("");
-    m_descText->SetText("");
+    m_titleText->Reset();
+    m_descText->Reset();
 
     if (m_updatedText)
-        m_updatedText->SetText("");
+        m_updatedText->Reset();
 
     if (m_downloadImage)
         m_downloadImage->Hide();
@@ -455,8 +452,8 @@ void MythNews::updateInfoView(MythUIButtonListItem *selected)
             QString text(tr("Updated") + " - ");
             QDateTime updated(site->lastUpdated());
             if (updated.toTime_t() != 0) {
-                text += site->lastUpdated().toString(m_dateFormat) + " ";
-                text += site->lastUpdated().toString(m_timeFormat);
+                text += MythDateTimeToString(site->lastUpdated(),
+                                             kDateTimeFull | kSimplify);
             }
             else
                 text += tr("Unknown");

diff --git a/mythplugins/mythnews/mythnews/mythnews.h b/mythplugins/mythnews/mythnews/mythnews.h
@@ -55,8 +55,6 @@ class MythNews : public MythScreenType
     int            m_TimerTimeout;
     unsigned int   m_UpdateFreq;
 
-    QString        m_timeFormat;
-    QString        m_dateFormat;
     QString        m_zoom;
     QString        m_browser;
     MythDialogBox *m_menuPopup;

diff --git a/mythtv/bindings/perl/MythTV.pm b/mythtv/bindings/perl/MythTV.pm
@@ -114,7 +114,7 @@ package MythTV;
 # schema version supported in the main code.  We need to check that the schema
 # version in the database is as expected by the bindings, which are expected
 # to be kept in sync with the main code.
-    our $SCHEMA_VERSION = "1279";
+    our $SCHEMA_VERSION = "1280";
 
 # NUMPROGRAMLINES is defined in mythtv/libs/libmythtv/programinfo.h and is
 # the number of items in a ProgramInfo QStringList group used by

diff --git a/mythtv/bindings/python/MythTV/connections.py b/mythtv/bindings/python/MythTV/connections.py
@@ -601,8 +601,9 @@ def _request(self, path='', **keyvars):
         """
         url = 'http://{0.host}:{0.port}/{1}'.format(self, path)
         if keyvars:
-            url += '?' + '&'.join(['{0}={1}'.format(*item)
-                                for item in keyvars.items()])
+            url += '?' + '&'.join(
+                        ['{0}={1}'.format(k,urllib2.quote(v))
+                                for k,v in keyvars.items()])
         self.log(self.log.NETWORK, 'Generating request', url)
         return self._Request(url)
 

diff --git a/mythtv/bindings/python/MythTV/methodheap.py b/mythtv/bindings/python/MythTV/methodheap.py
@@ -8,7 +8,7 @@
 from exceptions import *
 from logging import MythLog
 from connections import FEConnection, XMLConnection, BEEventConnection
-from utility import databaseSearch, datetime
+from utility import databaseSearch, datetime, check_ipv6
 from database import DBCache, DBData
 from system import SystemEvent
 from mythproto import BECache, FileOps, Program, FreeSpace, EventLock
@@ -1028,16 +1028,18 @@ def __init__(self, backend=None, port=None, db=None):
         if backend is None:
             # use master backend
             backend = self.db.settings.NULL.MasterServerIP
-        if re.match('(?:\d{1,3}\.){3}\d{1,3}',backend):
+        if re.match('(?:\d{1,3}\.){3}\d{1,3}',backend) or \
+                    check_ipv6(backend):
             # process ip address
             with self.db.cursor(self.log) as cursor:
                 if cursor.execute("""SELECT hostname FROM settings
                                      WHERE value='BackendServerIP'
                                      AND data=%s""", backend) == 0:
                     raise MythDBError(MythError.DB_SETTING, 
                                         backend+': BackendServerIP')
-                self.host = cursor.fetchone()[0]
-            self.port = int(self.db.settings[self.host].BackendStatusPort)
+                host = cursor.fetchone()[0]
+            self.host = backend
+            self.port = int(self.db.settings[host].BackendStatusPort)
         else:
             # assume given a hostname
             self.host = backend

diff --git a/mythtv/bindings/python/MythTV/static.py b/mythtv/bindings/python/MythTV/static.py
@@ -5,7 +5,7 @@
 """
 
 OWN_VERSION = (0,25,-1,2)
-SCHEMA_VERSION = 1279
+SCHEMA_VERSION = 1280
 NVSCHEMA_VERSION = 1007
 MUSICSCHEMA_VERSION = 1018
 PROTO_VERSION = '69'