Skip to content

Commit

Permalink
Services: Move filename, filesize and hostname from Program to Record…
Browse files Browse the repository at this point in the history 
…ingInfo
  • Loading branch information
@stuartm
stuartm committed Apr 14, 2015
1 parent bc1ffba commit f8d147e
Show file tree
Hide file tree
Showing 3 changed files with 88 additions and 50 deletions.
35 changes: 24 additions & 11 deletions mythtv/libs/libmythservicecontracts/datacontracts/programAndChannel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ class SERVICE_PUBLIC Program : public QObject
Q_OBJECT
Q_CLASSINFO( "version" , "1.11" );
Q_CLASSINFO( "defaultProp", "Description" );
Q_CLASSINFO( "deprecated" , "FileSize,FileName,HostName");

Q_PROPERTY( QDateTime StartTime READ StartTime WRITE setStartTime )
Q_PROPERTY( QDateTime EndTime READ EndTime WRITE setEndTime )
Expand All @@ -156,18 +157,23 @@ class SERVICE_PUBLIC Program : public QObject
Q_PROPERTY( QString SeriesId READ SeriesId WRITE setSeriesId DESIGNABLE SerializeDetails )
Q_PROPERTY( QString ProgramId READ ProgramId WRITE setProgramId DESIGNABLE SerializeDetails )
Q_PROPERTY( double Stars READ Stars WRITE setStars DESIGNABLE SerializeDetails )
Q_PROPERTY( qlonglong FileSize READ FileSize WRITE setFileSize DESIGNABLE SerializeDetails )
Q_PROPERTY( QDateTime LastModified READ LastModified WRITE setLastModified DESIGNABLE SerializeDetails )
Q_PROPERTY( int ProgramFlags READ ProgramFlags WRITE setProgramFlags DESIGNABLE SerializeDetails )
Q_PROPERTY( QString FileName READ FileName WRITE setFileName DESIGNABLE SerializeDetails )
Q_PROPERTY( QString HostName READ HostName WRITE setHostName DESIGNABLE SerializeDetails )
Q_PROPERTY( QDate Airdate READ Airdate WRITE setAirdate DESIGNABLE SerializeDetails )
Q_PROPERTY( QString Description READ Description WRITE setDescription DESIGNABLE SerializeDetails )
Q_PROPERTY( QString Inetref READ Inetref WRITE setInetref DESIGNABLE SerializeDetails )
Q_PROPERTY( int Season READ Season WRITE setSeason DESIGNABLE SerializeDetails )
Q_PROPERTY( int Episode READ Episode WRITE setEpisode DESIGNABLE SerializeDetails )
Q_PROPERTY( int TotalEpisodes READ TotalEpisodes WRITE setTotalEpisodes DESIGNABLE SerializeDetails )

// ----
// DEPRECATED
// These don't belong here, they are Recording only metadata
Q_PROPERTY( qlonglong FileSize READ FileSize WRITE setFileSize DESIGNABLE SerializeDetails )
Q_PROPERTY( QString FileName READ FileName WRITE setFileName DESIGNABLE SerializeDetails )
Q_PROPERTY( QString HostName READ HostName WRITE setHostName DESIGNABLE SerializeDetails )
// ----

Q_PROPERTY( QObject* Channel READ Channel DESIGNABLE SerializeChannel )
Q_PROPERTY( QObject* Recording READ Recording DESIGNABLE SerializeRecording )
Q_PROPERTY( QObject* Artwork READ Artwork DESIGNABLE SerializeArtwork )
Expand All @@ -184,21 +190,26 @@ class SERVICE_PUBLIC Program : public QObject
PROPERTYIMP ( QString , SeriesId )
PROPERTYIMP ( QString , ProgramId )
PROPERTYIMP ( double , Stars )
PROPERTYIMP ( qlonglong , FileSize )
PROPERTYIMP ( QDateTime , LastModified )
PROPERTYIMP ( int , ProgramFlags )
PROPERTYIMP ( int , VideoProps )
PROPERTYIMP ( int , AudioProps )
PROPERTYIMP ( int , SubProps )
PROPERTYIMP ( QString , FileName )
PROPERTYIMP ( QString , HostName )
PROPERTYIMP ( QDate , Airdate )
PROPERTYIMP ( QString , Description )
PROPERTYIMP ( QString , Inetref )
PROPERTYIMP ( int , Season )
PROPERTYIMP ( int , Episode )
PROPERTYIMP ( int , TotalEpisodes)

// ----
// DEPRECATED
// These don't belong here, they are Recording only metadata
PROPERTYIMP ( qlonglong , FileSize )
PROPERTYIMP ( QString , FileName )
PROPERTYIMP ( QString , HostName )
// ----

PROPERTYIMP_PTR( ChannelInfo , Channel )
PROPERTYIMP_PTR( RecordingInfo , Recording )
PROPERTYIMP_PTR( ArtworkInfoList, Artwork )
Expand All @@ -221,14 +232,14 @@ class SERVICE_PUBLIC Program : public QObject
: QObject ( parent ),
m_Repeat ( false ),
m_Stars ( 0 ),
m_FileSize ( 0 ),
m_ProgramFlags ( 0 ),
m_VideoProps ( 0 ),
m_AudioProps ( 0 ),
m_SubProps ( 0 ),
m_Season ( 0 ),
m_Episode ( 0 ),
m_TotalEpisodes ( 0 ),
m_FileSize ( 0 ), // DEPRECATED
m_Channel ( NULL ),
m_Recording ( NULL ),
m_Artwork ( NULL ),
Expand All @@ -240,7 +251,7 @@ class SERVICE_PUBLIC Program : public QObject
m_SerializeCast ( true )
{
}

Program( const Program &src )
{
Copy( src );
Expand All @@ -258,20 +269,22 @@ class SERVICE_PUBLIC Program : public QObject
m_SeriesId = src.m_SeriesId;
m_ProgramId = src.m_ProgramId;
m_Stars = src.m_Stars;
m_FileSize = src.m_FileSize;
m_LastModified = src.m_LastModified;
m_ProgramFlags = src.m_ProgramFlags;
m_VideoProps = src.m_VideoProps;
m_AudioProps = src.m_AudioProps;
m_SubProps = src.m_SubProps;
m_FileName = src.m_FileName;
m_HostName = src.m_HostName;
m_Airdate = src.m_Airdate;
m_Description = src.m_Description;
m_Inetref = src.m_Inetref;
m_Season = src.m_Season;
m_Episode = src.m_Episode;
m_TotalEpisodes = src.m_TotalEpisodes;
// DEPRECATED
m_FileSize = src.m_FileSize;
m_FileName = src.m_FileName;
m_HostName = src.m_HostName;
// ----
m_SerializeDetails = src.m_SerializeDetails;
m_SerializeChannel = src.m_SerializeChannel;
m_SerializeRecording= src.m_SerializeRecording;
Expand Down
59 changes: 37 additions & 22 deletions mythtv/libs/libmythservicecontracts/datacontracts/recording.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include <QString>

#include "serviceexp.h"
#include "datacontracthelper.h"
#include "datacontracthelper.h"
#include "programtypes.h"

namespace DTC
Expand All @@ -24,31 +24,41 @@ namespace DTC
class SERVICE_PUBLIC RecordingInfo : public QObject
{
Q_OBJECT
Q_CLASSINFO( "version", "1.02" );

Q_PROPERTY( uint RecordedId READ RecordedId WRITE setRecordedId )
Q_PROPERTY( RecStatus::Type Status READ Status WRITE setStatus )
Q_PROPERTY( int Priority READ Priority WRITE setPriority )
Q_PROPERTY( QDateTime StartTs READ StartTs WRITE setStartTs )
Q_PROPERTY( QDateTime EndTs READ EndTs WRITE setEndTs )

Q_PROPERTY( int RecordId READ RecordId WRITE setRecordId DESIGNABLE SerializeDetails )
Q_PROPERTY( QString RecGroup READ RecGroup WRITE setRecGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( QString PlayGroup READ PlayGroup WRITE setPlayGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( QString StorageGroup READ StorageGroup WRITE setStorageGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( int RecType READ RecType WRITE setRecType DESIGNABLE SerializeDetails )
Q_PROPERTY( int DupInType READ DupInType WRITE setDupInType DESIGNABLE SerializeDetails )
Q_PROPERTY( int DupMethod READ DupMethod WRITE setDupMethod DESIGNABLE SerializeDetails )
Q_PROPERTY( int EncoderId READ EncoderId WRITE setEncoderId DESIGNABLE SerializeDetails )
Q_PROPERTY( QString EncoderName READ EncoderName WRITE setEncoderName DESIGNABLE SerializeDetails )
Q_PROPERTY( QString Profile READ Profile WRITE setProfile DESIGNABLE SerializeDetails )
Q_CLASSINFO( "version", "1.3" );

Q_PROPERTY( uint RecordedId READ RecordedId WRITE setRecordedId )
Q_PROPERTY( RecStatus::Type Status READ Status WRITE setStatus )
Q_PROPERTY( int Priority READ Priority WRITE setPriority )
Q_PROPERTY( QDateTime StartTs READ StartTs WRITE setStartTs )
Q_PROPERTY( QDateTime EndTs READ EndTs WRITE setEndTs )

Q_PROPERTY( qlonglong FileSize READ FileSize WRITE setFileSize DESIGNABLE SerializeDetails ) // v1.3
Q_PROPERTY( QString FileName READ FileName WRITE setFileName DESIGNABLE SerializeDetails ) // v1.3
Q_PROPERTY( QString HostName READ HostName WRITE setHostName DESIGNABLE SerializeDetails ) // v1.3
Q_PROPERTY( QDateTime LastModified READ LastModified WRITE setLastModified DESIGNABLE SerializeDetails ) // v1.3

Q_PROPERTY( int RecordId READ RecordId WRITE setRecordId DESIGNABLE SerializeDetails )
Q_PROPERTY( QString RecGroup READ RecGroup WRITE setRecGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( QString PlayGroup READ PlayGroup WRITE setPlayGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( QString StorageGroup READ StorageGroup WRITE setStorageGroup DESIGNABLE SerializeDetails )
Q_PROPERTY( int RecType READ RecType WRITE setRecType DESIGNABLE SerializeDetails )
Q_PROPERTY( int DupInType READ DupInType WRITE setDupInType DESIGNABLE SerializeDetails )
Q_PROPERTY( int DupMethod READ DupMethod WRITE setDupMethod DESIGNABLE SerializeDetails )
Q_PROPERTY( int EncoderId READ EncoderId WRITE setEncoderId DESIGNABLE SerializeDetails )
Q_PROPERTY( QString EncoderName READ EncoderName WRITE setEncoderName DESIGNABLE SerializeDetails )
Q_PROPERTY( QString Profile READ Profile WRITE setProfile DESIGNABLE SerializeDetails )

PROPERTYIMP ( uint , RecordedId )
PROPERTYIMP_ENUM( RecStatus::Type , Status )
PROPERTYIMP ( int , Priority )
PROPERTYIMP ( QDateTime , StartTs )
PROPERTYIMP ( QDateTime , EndTs )


PROPERTYIMP ( qlonglong , FileSize ) // v1.3
PROPERTYIMP ( QString , FileName ) // v1.3
PROPERTYIMP ( QString , HostName ) // v1.3
PROPERTYIMP ( QDateTime , LastModified) // v1.3

PROPERTYIMP ( int , RecordId )
PROPERTYIMP ( QString , RecGroup )
PROPERTYIMP ( QString , StorageGroup)
Expand All @@ -74,6 +84,7 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
m_RecordedId ( 0 ),
m_Status ( RecStatus::Unknown ),
m_Priority ( 0 ),
m_FileSize ( 0 ),
m_RecordId ( 0 ),
m_RecType ( kNotRecording ),
m_DupInType ( kDupsInRecorded ),
Expand All @@ -82,8 +93,8 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
m_SerializeDetails( true )
{
}
RecordingInfo( const RecordingInfo &src )

RecordingInfo( const RecordingInfo &src )
{
Copy( src );
}
Expand All @@ -95,6 +106,10 @@ class SERVICE_PUBLIC RecordingInfo : public QObject
m_Priority = src.m_Priority ;
m_StartTs = src.m_StartTs ;
m_EndTs = src.m_EndTs ;
m_FileSize = src.m_FileSize ;
m_FileName = src.m_FileName ;
m_HostName = src.m_HostName ;
m_LastModified = src.m_LastModified ;
m_RecordId = src.m_RecordId ;
m_RecGroup = src.m_RecGroup ;
m_StorageGroup = src.m_StorageGroup ;
Expand Down
44 changes: 27 additions & 17 deletions mythtv/programs/mythbackend/services/serviceUtil.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,15 @@ void FillProgramInfo( DTC::Program *pProgram,
pProgram->setSeriesId ( pInfo->GetSeriesID() );
pProgram->setProgramId ( pInfo->GetProgramID() );
pProgram->setStars ( pInfo->GetStars() );
pProgram->setFileSize ( pInfo->GetFilesize() );
pProgram->setLastModified( pInfo->GetLastModifiedTime() );
pProgram->setProgramFlags( pInfo->GetProgramFlags() );

// ----
// DEPRECATED - See RecordingInfo instead
pProgram->setFileName ( pInfo->GetPathname() );
pProgram->setFileSize ( pInfo->GetFilesize() );
pProgram->setHostName ( pInfo->GetHostname() );
// ----

if (pInfo->GetOriginalAirDate().isValid())
pProgram->setAirdate( pInfo->GetOriginalAirDate() );
Expand Down Expand Up @@ -118,32 +122,38 @@ void FillProgramInfo( DTC::Program *pProgram,

DTC::RecordingInfo *pRecording = pProgram->Recording();

pRecording->setRecordedId ( pInfo->GetRecordingID() );
pRecording->setStatus ( pInfo->GetRecordingStatus() );
pRecording->setPriority( pInfo->GetRecordingPriority() );
pRecording->setStartTs ( pInfo->GetRecordingStartTime() );
pRecording->setEndTs ( pInfo->GetRecordingEndTime() );
const RecordingInfo pRecInfo(*pInfo);

pRecording->setRecordedId ( pRecInfo.GetRecordingID() );
pRecording->setStatus ( pRecInfo.GetRecordingStatus() );
pRecording->setPriority( pRecInfo.GetRecordingPriority() );
pRecording->setStartTs ( pRecInfo.GetRecordingStartTime() );
pRecording->setEndTs ( pRecInfo.GetRecordingEndTime() );

pRecording->setSerializeDetails( bDetails );

if (bDetails)
{
pRecording->setRecordId ( pInfo->GetRecordingRuleID() );
pRecording->setRecGroup ( pInfo->GetRecordingGroup() );
pRecording->setPlayGroup ( pInfo->GetPlaybackGroup() );
pRecording->setStorageGroup( pInfo->GetStorageGroup() );
pRecording->setRecType ( pInfo->GetRecordingRuleType() );
pRecording->setDupInType ( pInfo->GetDuplicateCheckSource() );
pRecording->setDupMethod ( pInfo->GetDuplicateCheckMethod() );
pRecording->setEncoderId ( pInfo->GetInputID() );
pRecording->setFileName ( pRecInfo.GetPathname() );
pRecording->setFileSize ( pRecInfo.GetFilesize() );
pRecording->setHostName ( pRecInfo.GetHostname() );
pRecording->setLastModified( pRecInfo.GetLastModifiedTime() );

pRecording->setRecordId ( pRecInfo.GetRecordingRuleID() );
pRecording->setRecGroup ( pRecInfo.GetRecordingGroup() );
pRecording->setPlayGroup ( pRecInfo.GetPlaybackGroup() );
pRecording->setStorageGroup( pRecInfo.GetStorageGroup() );
pRecording->setRecType ( pRecInfo.GetRecordingRuleType() );
pRecording->setDupInType ( pRecInfo.GetDuplicateCheckSource() );
pRecording->setDupMethod ( pRecInfo.GetDuplicateCheckMethod() );
pRecording->setEncoderId ( pRecInfo.GetInputID() );
if (pProgram->Channel())
{
QString encoderName = CardUtil::GetDisplayName(pInfo->GetInputID());
QString encoderName = CardUtil::GetDisplayName(pRecInfo.GetInputID());
pRecording->setEncoderName( encoderName );
}

const RecordingInfo ri(*pInfo);
pRecording->setProfile( ri.GetProgramRecordingProfile() );
pRecording->setProfile( pRecInfo.GetProgramRecordingProfile() );
}
}

Expand Down

0 comments on commit f8d147e

Please sign in to comment.