Ticket #11386: services-api.v1.patch

new file mythtv/libs/libmythservicecontracts/datacontracts/buildInfo.h

@@ +1 @@
+//////////////////////////////////////////////////////////////////////////////
+// Program Name: buildInfo.h
+// Created     : Jan. 16, 2013
+//
+// Copyright (c) 2013 David Blain <dblain@mythtv.org>
+//
+// Licensed under the GPL v2 or later, see COPYING for details
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef BUILDINFO_H_
+#define BUILDINFO_H_
+
+#include <QString>
+
+#include "serviceexp.h"
+#include "datacontracthelper.h"
+
+namespace DTC
+{
+
+class SERVICE_PUBLIC BuildInfo : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO( "version"    , "1.0" );
+
+    Q_PROPERTY( bool     LibX264      READ LibX264   WRITE setLibX264   )
+    Q_PROPERTY( bool     LibDNS_SD    READ LibX264   WRITE setLibDNS_SD )
+
+    PROPERTYIMP( bool    , LibX264   )
+    PROPERTYIMP( bool    , LibDNS_SD )
+
+    public:
+
+        static void InitializeCustomTypes()
+        {
+            qRegisterMetaType< BuildInfo   >();
+            qRegisterMetaType< BuildInfo*  >();
+        }
+
+    public:
+
+        BuildInfo(QObject *parent = 0)
+            : QObject    ( parent ),
+              m_LibX264  ( false  ),
+              m_LibDNS_SD( false  )
+        {
+        }
+
+        BuildInfo( const BuildInfo &src )
+        {
+            Copy( src );
+        }
+
+        void Copy( const BuildInfo &src )
+        {
+            m_LibX264   = src.m_LibX264  ;
+            m_LibDNS_SD = src.m_LibDNS_SD;
+        }
+};
+
+typedef BuildInfo* BuildInfoPtr;
+
+} // namespace DTC
+
+Q_DECLARE_METATYPE( DTC::BuildInfo  )
+Q_DECLARE_METATYPE( DTC::BuildInfo* )
+
+
+#endif

new file mythtv/libs/libmythservicecontracts/datacontracts/configurationInfo.h

@@ +1 @@
+//////////////////////////////////////////////////////////////////////////////
+// Program Name: configurationInfo.h
+// Created     : Jan. 16, 2013
+//
+// Copyright (c) 2010 David Blain <dblain@mythtv.org>
+//
+// Licensed under the GPL v2 or later, see COPYING for details
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef CONFIGURATIONINFO_H_
+#define CONFIGURATIONINFO_H_
+
+#include "serviceexp.h"
+#include "datacontracthelper.h"
+
+#include "buildInfo.h"
+#include "logInfo.h"
+
+namespace DTC
+{
+
+class SERVICE_PUBLIC ConfigurationInfo : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO( "version"    , "1.0" );
+
+    Q_PROPERTY( QObject*    Build   READ Build )
+    Q_PROPERTY( QObject*    Log     READ Log   )
+
+    PROPERTYIMP_PTR( BuildInfo, Build )
+    PROPERTYIMP_PTR( LogInfo,   Log   )
+
+    public:
+
+        static void InitializeCustomTypes()
+        {
+            qRegisterMetaType< ConfigurationInfo   >();
+            qRegisterMetaType< ConfigurationInfo*  >();
+
+            BuildInfo::InitializeCustomTypes();
+            LogInfo  ::InitializeCustomTypes();
+        }
+
+    public:
+
+        ConfigurationInfo(QObject *parent = 0)
+            : QObject   ( parent ),
+              m_Build   ( NULL   ),
+              m_Log     ( NULL   )
+        {
+        }
+
+        ConfigurationInfo( const ConfigurationInfo &src )
+            : m_Build  ( NULL ),
+              m_Log    ( NULL )
+        {
+            Copy( src );
+        }
+
+        void Copy( const ConfigurationInfo &src )
+        {
+            // We always need to make sure the child object is
+            // created with the correct parent *
+
+            if (src.m_Build)
+                Build()->Copy( src.m_Build );
+
+            if (src.m_Log)
+                Log()->Copy( src.m_Log  );
+
+        }
+};
+
+typedef ConfigurationInfo* ConfigurationInfoPtr;
+
+} // namespace DTC
+
+Q_DECLARE_METATYPE( DTC::ConfigurationInfo  )
+Q_DECLARE_METATYPE( DTC::ConfigurationInfo* )
+
+#endif

new file mythtv/libs/libmythservicecontracts/datacontracts/logInfo.h

@@ +1 @@
+//////////////////////////////////////////////////////////////////////////////
+// Program Name: logInfo.h
+// Created     : Jan. 16, 2013
+//
+// Copyright (c) 2013 David Blain <dblain@mythtv.org>
+//
+// Licensed under the GPL v2 or later, see COPYING for details
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef LOGINFO_H_
+#define LOGINFO_H_
+
+#include <QString>
+
+#include "serviceexp.h"
+#include "datacontracthelper.h"
+
+namespace DTC
+{
+
+class SERVICE_PUBLIC LogInfo : public QObject
+{
+    Q_OBJECT
+
+    Q_CLASSINFO( "version"    , "1.0" );
+    Q_CLASSINFO( "defaultProp", "LogArgs" );
+
+    Q_PROPERTY( QString  LogArgs      READ LogArgs   WRITE setLogArgs   )
+
+    PROPERTYIMP( QString,  LogArgs   )
+
+    public:
+
+        static void InitializeCustomTypes()
+        {
+            qRegisterMetaType< LogInfo   >();
+            qRegisterMetaType< LogInfo*  >();
+        }
+
+    public:
+
+        LogInfo(QObject *parent = 0)
+            : QObject    ( parent ),
+              m_LogArgs  ( ""     )
+        {
+        }
+
+        LogInfo( const LogInfo &src )
+        {
+            Copy( src );
+        }
+
+        void Copy( const LogInfo &src )
+        {
+            m_LogArgs   = src.m_LogArgs  ;
+        }
+};
+
+typedef LogInfo* LogInfoPtr;
+
+} // namespace DTC
+
+Q_DECLARE_METATYPE( DTC::LogInfo  )
+Q_DECLARE_METATYPE( DTC::LogInfo* )
+
+
+#endif

mythtv/libs/libmythservicecontracts/datacontracts/storageGroupDir.h

@@ -14 +14 @@
 class SERVICE_PUBLIC StorageGroupDir : public QObject
 {
     Q_OBJECT
-    Q_CLASSINFO( "version"    , "1.0" );
+    Q_CLASSINFO( "version"    , "1.1" );
 
     Q_PROPERTY( int             Id              READ Id               WRITE setId             )
     Q_PROPERTY( QString         GroupName       READ GroupName        WRITE setGroupName      )
     Q_PROPERTY( QString         HostName        READ HostName         WRITE setHostName       )
     Q_PROPERTY( QString         DirName         READ DirName          WRITE setDirName        )
+    Q_PROPERTY( bool            DirPerms        READ DirPerms         WRITE setDirPerms       )
 
     PROPERTYIMP    ( int        , Id             )
     PROPERTYIMP    ( QString    , GroupName      )
     PROPERTYIMP    ( QString    , HostName       )
     PROPERTYIMP    ( QString    , DirName        )
+    PROPERTYIMP    ( bool       , DirPerms       )
 
     public:
 
@@ -53 +55 @@
             m_GroupName     = src.m_GroupName     ;
             m_HostName      = src.m_HostName      ;
             m_DirName       = src.m_DirName       ;
+            m_DirPerms      = src.m_DirPerms      ;
         }
 };
 

mythtv/libs/libmythservicecontracts/libmythservicecontracts.pro

@@ -40 +40 @@
 HEADERS += datacontracts/liveStreamInfo.h        datacontracts/liveStreamInfoList.h
 HEADERS += datacontracts/labelValue.h
 HEADERS += datacontracts/logMessage.h            datacontracts/logMessageList.h
+HEADERS += datacontracts/buildInfo.h             datacontracts/logInfo.h
+HEADERS += datacontracts/configurationInfo.h
 
 SOURCES += service.cpp
 
@@ -80 +82 @@
 incDatacontracts.files += datacontracts/liveStreamInfo.h      datacontracts/liveStreamInfoList.h
 incDatacontracts.files += datacontracts/labelValue.h
 incDatacontracts.files += datacontracts/logMessage.h          datacontracts/logMessageList.h
+incDatacontracts.files += datacontracts/buildInfo.h           datacontracts/logInfo.h
+incDatacontracts.files += datacontracts/configurationInfo.h
 
 INSTALLS += inc incServices incDatacontracts
 

mythtv/libs/libmythservicecontracts/services/mythServices.h

@@ -22 +22 @@
 #include "datacontracts/timeZoneInfo.h"
 #include "datacontracts/logMessage.h"
 #include "datacontracts/logMessageList.h"
+#include "datacontracts/configurationInfo.h"
 
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -42 +43 @@
 class SERVICE_PUBLIC MythServices : public Service  //, public QScriptable ???
 {
     Q_OBJECT
-    Q_CLASSINFO( "version"    , "2.0" );
+    Q_CLASSINFO( "version"    , "2.1" );
     Q_CLASSINFO( "PutSetting_Method",            "POST" )
     Q_CLASSINFO( "AddStorageGroupDir_Method",    "POST" )
     Q_CLASSINFO( "RemoveStorageGroupDir_Method", "POST" )
@@ -66 +67 @@
             DTC::TimeZoneInfo       ::InitializeCustomTypes();
             DTC::LogMessage         ::InitializeCustomTypes();
             DTC::LogMessageList     ::InitializeCustomTypes();
+            DTC::ConfigurationInfo  ::InitializeCustomTypes();
         }
 
     public slots:
@@ -138 +140 @@
         virtual QString             ProfileUpdated      ( void ) = 0;
 
         virtual QString             ProfileText         ( void ) = 0;
+
+        virtual DTC::ConfigurationInfo* GetConfigurationInfo  ( void ) = 0;
 };
 
 #endif

mythtv/programs/mythbackend/services/myth.cpp

@@ -26 +26 @@
 #include "myth.h"
 
 #include <QDir>
+#include <QFileInfo>
 #include <QCryptographicHash>
 #include <QHostAddress>
 #include <QUdpSocket>
 
+#include "config.h"
 #include "version.h"
 #include "mythversion.h"
 #include "mythcorecontext.h"
@@ -249 +251 @@
     while (query.next())
     {
         DTC::StorageGroupDir *pStorageGroupDir = pList->AddNewStorageGroupDir();
+        QFileInfo fi(query.value(3).toString());
             
         pStorageGroupDir->setId            ( query.value(0).toInt()       );
         pStorageGroupDir->setGroupName     ( query.value(1).toString()    );
         pStorageGroupDir->setHostName      ( query.value(2).toString()    );
         pStorageGroupDir->setDirName       ( query.value(3).toString()    );
+        pStorageGroupDir->setDirPerms    ( fi.isReadable() && fi.isWritable() );
     }
 
     return pList;
@@ -928 +932 @@
     return sProfileText;
 }
 
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+DTC::ConfigurationInfo* Myth::GetConfigurationInfo( void )
+{
+
+    // ----------------------------------------------------------------------
+    // Create and populate a Configuration object
+    // ----------------------------------------------------------------------
+
+    DTC::ConfigurationInfo *pInfo      = new DTC::ConfigurationInfo();
+    DTC::BuildInfo         *pBuild     = pInfo->Build();
+    DTC::LogInfo           *pLog       = pInfo->Log();
+
+    pBuild->setLibX264     ( CONFIG_LIBX264   );
+    pBuild->setLibDNS_SD   ( CONFIG_LIBDNS_SD );
+    pLog->setLogArgs       ( logPropagateArgs );
+
+    // ----------------------------------------------------------------------
+    // Return the pointer... caller is responsible to delete it!!!
+    // ----------------------------------------------------------------------
+
+    return pInfo;
+
+}

mythtv/programs/mythbackend/services/myth.h

@@ -109 +109 @@
         QString             ProfileUpdated      ( void );
 
         QString             ProfileText         ( void );
+
+        DTC::ConfigurationInfo*   GetConfigurationInfo  ( void );
 };
 
 // --------------------------------------------------------------------------
@@ -255 +257 @@
         {
             return m_obj.ProfileText();
         }
+
+        QObject* GetConfigurationInfo  ( void )
+        {
+            return m_obj.GetConfigurationInfo();
+        }
 };