From de3a21c0408251a1eea6f22bb5fbf2930e9c9d4e Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 16 Mar 2016 12:58:08 +0000 Subject: mythtv: initial commit for 0.28 --- .gitignore | 6 +- .../mythtv/stable-0.28/git_src/checkout_mythtv.sh | 40 + .../mythtv/stable-0.28/git_src/checkout_mythweb.sh | 38 + abs/core/mythtv/stable-0.28/git_src/git_hash | 1 + abs/core/mythtv/stable-0.28/git_src/git_hash_web | 1 + abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD | 125 ++ .../mythtv/stable-0.28/mythplugins/__changelog | 1 + .../stable-0.28/mythplugins/archivemenu.xml.patch | 32 + .../stable-0.28/mythplugins/archiveutils.xml.patch | 27 + .../stable-0.28/mythplugins/cdparanoia.patch | 52 + .../mythplugins/mythburn.py-aspectratio.patch | 138 ++ .../mythplugins/mythplugins-mythzoneminder.install | 11 + abs/core/mythtv/stable-0.28/mythtv/PKGBUILD | 104 ++ abs/core/mythtv/stable-0.28/mythtv/__changelog | 2 + .../mythtv/fixQTvirtualkeyboard.patch.28 | 46 + .../stable-0.28/mythtv/menu-xml/HOST_SETTINGS.xml | 114 ++ .../stable-0.28/mythtv/menu-xml/dvd_backup.xml | 39 + .../mythtv/stable-0.28/mythtv/menu-xml/game.xml | 12 + .../stable-0.28/mythtv/menu-xml/info_menu.xml | 76 + abs/core/mythtv/stable-0.28/mythtv/menu-xml/is.xml | 3 + .../mythtv/menu-xml/lh_backend_control.xml | 24 + .../stable-0.28/mythtv/menu-xml/library.xml.patch | 25 + .../mythtv/stable-0.28/mythtv/menu-xml/linhes.xml | 70 + .../stable-0.28/mythtv/menu-xml/linhes_tools.xml | 31 + .../stable-0.28/mythtv/menu-xml/mainmenu.xml.patch | 15 + .../stable-0.28/mythtv/menu-xml/mythbackup.xml | 22 + .../stable-0.28/mythtv/menu-xml/mythrestore.xml | 24 + .../mythtv/menu-xml/optical_menu.xml.patch | 23 + .../mythtv/menu-xml/original/create_patch.sh | 5 + .../stable-0.28/mythtv/menu-xml/siriusmenu.xml | 419 +++++ .../mythtv/stable-0.28/mythtv/menu-xml/update.xml | 11 + .../mythtv/stable-0.28/mythtv/menu-xml/update2.xml | 25 + .../mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml | 574 ++++++ .../mythtv/stable-0.28/mythtv/myth_settings.patch | 1972 ++++++++++++++++++++ abs/core/mythtv/stable-0.28/mythtv/mythtv.install | 25 + abs/core/mythtv/stable-0.28/mythtv/recordings | 112 ++ .../stable-0.28/mythtv/suggestedstarttime.patch.v1 | 32 + .../mythtv/videoAlwaysUseBookmark.patch | 22 + abs/core/mythtv/stable-0.28/mythweb/PKGBUILD | 58 + .../mythtv/stable-0.28/mythweb/mythweb.include | 8 + .../mythtv/stable-0.28/mythweb/mythweb.install | 22 + .../stable-0.28/mythweb/mythweb_gen_light.conf | 1 + 42 files changed, 4384 insertions(+), 4 deletions(-) create mode 100755 abs/core/mythtv/stable-0.28/git_src/checkout_mythtv.sh create mode 100755 abs/core/mythtv/stable-0.28/git_src/checkout_mythweb.sh create mode 100644 abs/core/mythtv/stable-0.28/git_src/git_hash create mode 100644 abs/core/mythtv/stable-0.28/git_src/git_hash_web create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/__changelog create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/archivemenu.xml.patch create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/archiveutils.xml.patch create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/cdparanoia.patch create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/mythburn.py-aspectratio.patch create mode 100644 abs/core/mythtv/stable-0.28/mythplugins/mythplugins-mythzoneminder.install create mode 100644 abs/core/mythtv/stable-0.28/mythtv/PKGBUILD create mode 100644 abs/core/mythtv/stable-0.28/mythtv/__changelog create mode 100644 abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/HOST_SETTINGS.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/dvd_backup.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/game.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/info_menu.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/is.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/lh_backend_control.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/library.xml.patch create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes_tools.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/mainmenu.xml.patch create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythbackup.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythrestore.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/optical_menu.xml.patch create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/original/create_patch.sh create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/siriusmenu.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/update.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/update2.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml create mode 100644 abs/core/mythtv/stable-0.28/mythtv/myth_settings.patch create mode 100644 abs/core/mythtv/stable-0.28/mythtv/mythtv.install create mode 100644 abs/core/mythtv/stable-0.28/mythtv/recordings create mode 100644 abs/core/mythtv/stable-0.28/mythtv/suggestedstarttime.patch.v1 create mode 100644 abs/core/mythtv/stable-0.28/mythtv/videoAlwaysUseBookmark.patch create mode 100644 abs/core/mythtv/stable-0.28/mythweb/PKGBUILD create mode 100644 abs/core/mythtv/stable-0.28/mythweb/mythweb.include create mode 100644 abs/core/mythtv/stable-0.28/mythweb/mythweb.install create mode 100644 abs/core/mythtv/stable-0.28/mythweb/mythweb_gen_light.conf diff --git a/.gitignore b/.gitignore index a3f7dd8..aec3eee 100644 --- a/.gitignore +++ b/.gitignore @@ -22,7 +22,5 @@ srclinks.* .updated *.pkg.tar.* */git_src/mythtv -abs/core/mythtv/stable-0.25/git_src/mythtv -abs/core/mythtv/stable-0.25/git_src/mythweb -abs/core/mythtv/stable-0.27/git_src/mythtv -abs/core/mythtv/stable-0.27/git_src/mythweb +abs/core/mythtv/stable-0.*/git_src/mythtv +abs/core/mythtv/stable-0.*/git_src/mythweb diff --git a/abs/core/mythtv/stable-0.28/git_src/checkout_mythtv.sh b/abs/core/mythtv/stable-0.28/git_src/checkout_mythtv.sh new file mode 100755 index 0000000..b579873 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/git_src/checkout_mythtv.sh @@ -0,0 +1,40 @@ +#!/bin/bash +#Quick script used to checkout the MythTV source +#This source should be used build all mythplugins & main program + +_gitroot="https://github.com/MythTV/mythtv.git" +_gitname="mythtv" +_gitbranch="fixes/0.28" + +startdir=`pwd` + +#Set this to True, to update mythtv to the latest. +#If not true then it will use the hash stored in git_hash +_current="True" + +_checkoutHASH=`cat git_hash` + +if [ -d $_gitname ] +then + cd $_gitname + git checkout $_gitbranch + git pull + echo "The local files are updated." + cd $startdir +else + git clone -b $_gitbranch $_gitroot +fi + +if [ -d $_gitname ] +then + cd $_gitname + if [ $_current == True ] + then + git rev-parse HEAD > $startdir/git_hash + else + git checkout $_checkoutHASH + fi + cd mythtv + sh ./version.sh `pwd` +fi +echo "GIT checkout done or server timeout" diff --git a/abs/core/mythtv/stable-0.28/git_src/checkout_mythweb.sh b/abs/core/mythtv/stable-0.28/git_src/checkout_mythweb.sh new file mode 100755 index 0000000..94b872e --- /dev/null +++ b/abs/core/mythtv/stable-0.28/git_src/checkout_mythweb.sh @@ -0,0 +1,38 @@ +#!/bin/bash +#Quick script used to checkout the Mythweb source +#This source should be used build all mythplugins & main program + +_gitroot="https://github.com/MythTV/mythweb.git" +_gitname="mythweb" +_gitbranch="fixes/0.28" + +startdir=`pwd` + +#Set this to True, to update mythtv to the latest. +#If not true then it will use the hash stored in git_hash +_current="True" + +_checkoutHASH=`cat git_hash_web` + +if [ -d $_gitname ] +then + cd $_gitname + git checkout $_gitbranch + git pull + echo "The local files are updated." + cd $startdir +else + git clone -b $_gitbranch $_gitroot +fi + +if [ -d $_gitname ] +then + cd $_gitname + if [ $_current == True ] + then + git rev-parse HEAD > $startdir/git_hash_web + else + git checkout $_checkoutHASH + fi +fi +echo "GIT checkout done or server timeout" diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash b/abs/core/mythtv/stable-0.28/git_src/git_hash new file mode 100644 index 0000000..abffafd --- /dev/null +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash @@ -0,0 +1 @@ +0e01f7278e9c571936fa8518b950623a0eb31438 diff --git a/abs/core/mythtv/stable-0.28/git_src/git_hash_web b/abs/core/mythtv/stable-0.28/git_src/git_hash_web new file mode 100644 index 0000000..0223298 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/git_src/git_hash_web @@ -0,0 +1 @@ +94ec03ada41da6ab7883b0eb037ea58239f05913 diff --git a/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD new file mode 100644 index 0000000..36fb62d --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/PKGBUILD @@ -0,0 +1,125 @@ +pkgbase=mythplugins +pkgname=('mytharchive' + 'mythbrowser' + 'mythgallery' + 'mythgame' + 'mythmusic' + 'mythnetvision' + 'mythnews' + 'mythweather' + 'mythzoneminder') +pkgver=0.28 +pkgrel=1 +arch=('i686' 'x86_64') +url="http://www.mythtv.org" +license=('GPL') +makedepends=('cdrkit' 'dcraw' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' + 'libvorbis' 'mesa' 'libgl' 'mplayer' "mythtv>=${pkgver}" + 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' + 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' + 'perl-xml-simple' 'perl-xml-xpath' 'python-oauth' 'python2-pillow' + 'python-pycurl' 'zlib') +source=('mythburn.py-aspectratio.patch' 'archivemenu.xml.patch' 'archiveutils.xml.patch' + 'cdparanoia.patch') + +build() { + if [ -e ${srcdir}/mythplugins ] + then + msg "Removing old mythplugins src" + rm -rf ${srcdir}/mythplugins + fi + + cd ${startdir} + msg "Copying in mythplugins git_src" + cp -rp ../git_src/mythtv/mythplugins $srcdir + cd ${srcdir}/${pkgbase} + + msg "Patching configure" + patch -Np1 -i "$srcdir/cdparanoia.patch" + + msg "Configuring mythplugins" + ./configure --prefix=/usr \ + --enable-all \ + --python=/usr/bin/python2 + + msg "Compiling mythplugins" + qmake-qt5 mythplugins.pro || return 1 + make || return 1 +} + +package_mytharchive() { + pkgdesc="Create DVDs or archive recorded shows in MythTV" + depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' "mythtv>=${pkgver}" + 'mjpegtools' 'python2-pillow') + cd "${srcdir}/${_gitname}/${pkgbase}/mytharchive" + patch mythburn/scripts/mythburn.py < $srcdir/mythburn.py-aspectratio.patch || return 1 + patch theme/menus/archivemenu.xml < $srcdir/archivemenu.xml.patch || return 1 + patch theme/menus/archiveutils.xml < $srcdir/archiveutils.xml.patch || return 1 + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythbrowser() { + pkgdesc="Mini web browser for MythTV" + depends=("mythtv>=${pkgver}") + cd "${srcdir}/${_gitname}/${pkgbase}/mythbrowser" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythgallery() { + pkgdesc="Image gallery plugin for MythTV" + depends=('libexif' "mythtv>=${pkgver}" 'dcraw') + cd "${srcdir}/${_gitname}/${pkgbase}/mythgallery" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythgame() { + pkgdesc="Game emulator plugin for MythTV" + depends=("mythtv>=${pkgver}" 'zlib') + cd "${srcdir}/${_gitname}/${pkgbase}/mythgame" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythmusic() { + pkgdesc="Music playing plugin for MythTV" + depends=('cdparanoia' 'fftw' 'flac' 'libcdaudio' 'libcdio-paranoia' + 'libvisual-plugins' 'libvorbis' "mythtv>=${pkgver}" 'taglib') + cd "${srcdir}/${_gitname}/${pkgbase}/mythmusic" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythnetvision() { + pkgdesc="MythNetvision plugin for MythTV" + depends=("mythtv>=${pkgver}" 'python-pycurl' 'python-oauth' + 'python2-lxml' 'python2') + cd "${srcdir}/${_gitname}/${pkgbase}/mythnetvision" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythnews() { + pkgdesc="News checking plugin for MythTV" + depends=("mythtv>=${pkgver}") + cd "${srcdir}/${_gitname}/${pkgbase}/mythnews" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythweather() { + pkgdesc="Weather checking plugin for MythTV" + depends=("mythtv>=${pkgver}" 'perl-date-manip' 'perl-json' 'perl-soap-lite' + 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' + 'perl-datetime-format-iso8601') + cd "${srcdir}/${_gitname}/${pkgbase}/mythweather" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +package_mythzoneminder() { + pkgdesc="View CCTV footage from zoneminder in MythTV" + depends=("mythtv>=${pkgver}") +# install=mythplugins-mythzoneminder.install + cd "${srcdir}/${_gitname}/${pkgbase}/mythzoneminder" + make INSTALL_ROOT="${pkgdir}" install || return 1 +} + +md5sums=('e98c2a09bcb051fdde959fb4bb2e5ab2' + '0364d2613f22943f3d4c9d5ee43c1982' + '1063cf62878cd341476f28f63cb12782' + '5de8dd79d0b8a2b006f3c3258938b6b7') diff --git a/abs/core/mythtv/stable-0.28/mythplugins/__changelog b/abs/core/mythtv/stable-0.28/mythplugins/__changelog new file mode 100644 index 0000000..48cdce8 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/__changelog @@ -0,0 +1 @@ +placeholder diff --git a/abs/core/mythtv/stable-0.28/mythplugins/archivemenu.xml.patch b/abs/core/mythtv/stable-0.28/mythplugins/archivemenu.xml.patch new file mode 100644 index 0000000..f53e9d0 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/archivemenu.xml.patch @@ -0,0 +1,32 @@ +--- archivemenu.xml.orig 2014-02-11 23:01:41.292364208 +0000 ++++ archivemenu.xml 2014-02-11 23:02:13.544892518 +0000 +@@ -3,12 +3,14 @@ + + + + +@@ -22,12 +24,14 @@ + + + + diff --git a/abs/core/mythtv/stable-0.28/mythplugins/archiveutils.xml.patch b/abs/core/mythtv/stable-0.28/mythplugins/archiveutils.xml.patch new file mode 100644 index 0000000..9c17678 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/archiveutils.xml.patch @@ -0,0 +1,27 @@ +--- archiveutils.xml.orig 2014-02-11 23:01:41.292364208 +0000 ++++ archiveutils.xml 2014-02-11 23:02:13.544892518 +0000 +@@ -2,19 +2,22 @@ + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythplugins/cdparanoia.patch b/abs/core/mythtv/stable-0.28/mythplugins/cdparanoia.patch new file mode 100644 index 0000000..b4d1449 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/cdparanoia.patch @@ -0,0 +1,52 @@ +diff -Nru a/configure b/configure +--- a/configure 2012-10-02 23:30:24.000000000 +1300 ++++ b/configure 2013-01-09 14:54:40.448916370 +1300 +@@ -649,7 +649,7 @@ + echo "MythMusic requires FLAC." + fi + +- if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then ++ if ! check_lib cdio/cdio.h cdio_open -lcdio || ! check_lib cdio/paranoia/cdda.h cdio_cddap_open -lcdio_cdda || ! check_lib cdio/paranoia/paranoia.h cdio_paranoia_init -lcdio_paranoia ; then + disable cdio + fi + +diff -Nru a/mythmusic/mythmusic/cddecoder.cpp b/mythmusic/mythmusic/cddecoder.cpp +--- a/mythmusic/mythmusic/cddecoder.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.cpp 2013-01-09 14:53:37.031690618 +1300 +@@ -14,7 +14,7 @@ + #include + + // libcdio +-#include ++#include + #include + + // MythTV +diff -Nru a/mythmusic/mythmusic/cddecoder.h b/mythmusic/mythmusic/cddecoder.h +--- a/mythmusic/mythmusic/cddecoder.h 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cddecoder.h 2013-01-09 14:53:12.328140979 +1300 +@@ -11,8 +11,8 @@ + #endif + + #ifdef HAVE_CDIO +-# include +-# include ++# include ++# include + #endif + + class Metadata; +diff -Nru a/mythmusic/mythmusic/cdrip.cpp b/mythmusic/mythmusic/cdrip.cpp +--- a/mythmusic/mythmusic/cdrip.cpp 2012-10-02 23:30:24.000000000 +1300 ++++ b/mythmusic/mythmusic/cdrip.cpp 2013-01-09 14:54:11.815330268 +1300 +@@ -8,8 +8,8 @@ + + #include "config.h" + #ifdef HAVE_CDIO +-# include +-# include ++# include ++# include + #endif //def HAVE_CDIO + + // C++ includes diff --git a/abs/core/mythtv/stable-0.28/mythplugins/mythburn.py-aspectratio.patch b/abs/core/mythtv/stable-0.28/mythplugins/mythburn.py-aspectratio.patch new file mode 100644 index 0000000..377de95 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/mythburn.py-aspectratio.patch @@ -0,0 +1,138 @@ +--- mythburn.py.orig 2013-12-16 22:41:31.532703825 +0000 ++++ mythburn.py 2013-12-16 22:40:52.191109409 +0000 +@@ -98,6 +98,7 @@ + from fcntl import ioctl + import CDROM + from shutil import copy ++from subprocess import Popen, PIPE + + import MythTV + from MythTV import datetime +@@ -440,7 +441,7 @@ + os.remove(os.path.join(root, name)) + + ############################################################# +-# Romoves all the objects from a directory ++# Removes all the objects from a directory + + def deleteEverythingInFolder(folder): + for root, dirs, files in os.walk(folder, topdown=False): +@@ -666,14 +667,14 @@ + # Gets the aspect ratio of a video file from its stream info file + + def getAspectRatioOfVideo(index): +- """Returns the aspect ratio of the video file (1.333, 1.778, etc)""" ++ """Returns the aspect ratio of the original video file (1.333, 1.778, etc)""" + + #open the XML containing information about this file +- infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo.xml')) ++ infoDOM = xml.dom.minidom.parse(os.path.join(getItemTempPath(index), 'streaminfo_orig.xml')) + + #error out if its the wrong XML + if infoDOM.documentElement.tagName != "file": +- fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo.xml')) ++ fatalError("Stream info file doesn't look right (%s)" % os.path.join(getItemTempPath(index), 'streaminfo_orig.xml')) + video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] + if video.attributes["aspectratio"].value != 'N/A': + aspect_ratio = float(video.attributes["aspectratio"].value) +@@ -1695,6 +1696,37 @@ + fatalError("Failed while running mytharchivehelper to get stream information.\n" + "Result: %d, Command was %s" % (result, command)) + ++ #open the XML containing information about this file ++ infoDOM = xml.dom.minidom.parse(xmlFilename) ++ ++ #error out if its the wrong XML ++ if infoDOM.documentElement.tagName != "file": ++ fatalError("This info file doesn't look right (%s)." % xmlFilename) ++ ++ file = infoDOM.getElementsByTagName("file")[0] ++ video = infoDOM.getElementsByTagName("file")[0].getElementsByTagName("streams")[0].getElementsByTagName("video")[0] ++ ++ #use ffmpeg to get display aspect ratio (DAR) of video ++ cmd = "mythffmpeg -i " + quoteCmdArg(file.attributes["filename"].value) + " 2>&1" ++ aspect_ratio = Popen(cmd, shell=True, stdout=PIPE).stdout.read() ++ if "DAR" in aspect_ratio: ++ #clean DAR string ++ aspect_ratio = aspect_ratio.split("DAR ")[-1].split(",")[0] ++ aspect_ratio = ''.join([c for c in aspect_ratio if c in '1234567890:']).split(":") ++ else: ++ #calculate aspect from video size ++ aspect_ratio = getVideoSize(xmlFilename) ++ ++ #convert to decimal+ ++ aspect_ratio = float(aspect_ratio[0]) / float(aspect_ratio[1]) ++ ++ write("Video %s aspect ratio is: %s" % (filename, aspect_ratio)) ++ ++ #set aspect ratio ++ video.setAttribute("aspectratio",str(aspect_ratio)) ++ ++ WriteXMLToFile (infoDOM,xmlFilename) ++ + # print out the streaminfo.xml file to the log + infoDOM = xml.dom.minidom.parse(xmlFilename) + write(xmlFilename + ":-\n" + infoDOM.toprettyxml(" ", ""), False) +@@ -2010,7 +2042,7 @@ + ############################################################# + # Re-encodes a file to mpeg2 + +-def encodeVideoToMPEG2(source, destvideofile, video, audio1, audio2, aspectratio, profile): ++def encodeVideoToMPEG2(source, destvideofile, video, folder, audio1, audio2, aspectratio, profile): + """Encodes an unknown video source file eg. AVI to MPEG2 video and AC3 audio, use mythffmpeg""" + + profileNode = findEncodingProfile(profile) +@@ -2035,6 +2067,35 @@ + value = quoteCmdArg(destvideofile) + if value == "%aspect": + value = aspectratio ++ if value == "720x480" or value == "720x576": ++ videores, fps, videoAR = getVideoParams(folder) ++ videoWidth = int(videores.split("x")[0]) ++ videoHeight = int(videores.split("x")[1]) ++ ++ #add padding to correct for aspects > than 1.9:1 ++ if float(videoAR) >= 1.9: ++ #check which video type and set the correct height ++ if videomode == "ntsc": ++ videoModeHeight = 480 ++ else: ++ videoModeHeight = 576 ++ ++ #calculate the video height based on the aspect ratio of the video ++ #multiply by 1.185 to compensate for dvds non-square pixels ++ calVideoHeight = int(round((720 / float(videoAR)) * 1.185)) ++ if calVideoHeight % 2 == 1: ++ calVideoHeight = calVideoHeight + 1 ++ #write("calVideoHeight: %s" % calVideoHeight) ++ ++ #use original video height if the calculated video height is close ++ if (calVideoHeight + 20 < videoHeight) or (calVideoHeight - 20 > videoHeight): ++ videoHeight = calVideoHeight ++ ++ cropPixels = videoModeHeight - videoHeight ++ ++ write("Crop Pixels Total: %s" % cropPixels) ++ name = "-vf" ++ value = "\"scale=720:%d, setsar=1:1, pad=720:%d:0:%d:black\"" % (videoModeHeight - cropPixels, videoModeHeight, cropPixels / 2) + + # only re-encode the audio if it is not already in AC3 format + if audio1[AUDIO_CODEC] == "AC3": +@@ -4608,7 +4669,7 @@ + + #do the re-encode + encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, +- audio1, audio2, aspectratio, profile) ++ folder, audio1, audio2, aspectratio, profile) + mediafile = os.path.join(folder, 'newfile2.mpg') + + #remove the old mediafile that was run through mythtranscode +@@ -4762,7 +4823,7 @@ + + #do the re-encode + encodeVideoToMPEG2(mediafile, os.path.join(folder, "newfile2.mpg"), video, +- audio1, audio2, aspectratio, profile) ++ folder, audio1, audio2, aspectratio, profile) + mediafile = os.path.join(folder, 'newfile2.mpg') + + #remove an intermediate file diff --git a/abs/core/mythtv/stable-0.28/mythplugins/mythplugins-mythzoneminder.install b/abs/core/mythtv/stable-0.28/mythplugins/mythplugins-mythzoneminder.install new file mode 100644 index 0000000..a4e0c0d --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythplugins/mythplugins-mythzoneminder.install @@ -0,0 +1,11 @@ +post_install() { + . /etc/systemconfig + if [ $SystemType = Master_backend -o $SystemType = Standalone ] + then + echo "This looks a zoneminder server install" + echo "Installing zoneminder" + #for reference the pacman statement below will not work because of a db lock. + pacman -S zoneminder + fi + +} diff --git a/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD new file mode 100644 index 0000000..e0afc58 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/PKGBUILD @@ -0,0 +1,104 @@ +pkgname=mythtv +pkgver=0.28 +pkgrel=2 +commit_hash=`cat ../git_src/git_hash` +pkgdesc="A Homebrew PVR project $commit_hash" +arch=('i686' 'x86_64') +url="http://www.mythtv.org/" +license=('GPL') +depends=('avahi' 'faad2' 'fftw' 'glew' 'exiv2' 'lame' 'libass' 'libavc1394' 'libcdio' + 'libcec' 'libcrystalhd-git' 'libiec61883' 'libva' 'libvdpau' 'libvpx' + 'libxinerama' 'libxrandr' 'libxml2' 'LinHES-config>=8.1-6' 'lirc-utils' + 'mysql-clients' 'mysql-python' 'openssl' 'perl-date-manip' 'perl-dbd-mysql' + 'perl-io-socket-inet6' 'perl-libwww' 'perl-math-round' + 'perl-net-upnp' 'perl-soap-lite' 'perl-xml-sax' 'python2-pycurl' + 'python2-lxml' 'qt5-script' 'qt5-webkit' 'sdl' 'taglib' 'urlgrabber' 'wget' + 'x264' 'xmltv') +makedepends=('mesa' 'libgl' 'yasm' 'git' 'rsync') +replaces=() +groups=('pvr') +backup=() +install='mythtv.install' + +patches=('myth_settings.patch' + 'videoAlwaysUseBookmark.patch' + ) + +optdepends=() +source=(`echo ${patches[@]:0}` 'recordings') + +build() { + if [ -e ${srcdir}/mythtv ] + then + msg "Removing old mythtv src" + rm -rf ${srcdir}/mythtv + fi + + cd ${startdir} + msg "Copying in mythtv git_src" + cp -rp ../git_src/mythtv/mythtv $srcdir + cd ${srcdir}/$pkgname + echo "#!/bin/bash" > version.sh + + msg "--------------------------applying patches------------------------------" + for i in `echo ${patches[@]:0}` + do + echo applying $i + patch -Np2 -i ${startdir}/src/$i || return 1 + echo "-----------------------------" + done + msg "--------------------------done applying patches-------------------------" + + msg "Configuring mythtv" + ARCH=${CARCH/_/-} + #disable mythlogserver due to http://code.mythtv.org/trac/ticket/11230 + ./configure --prefix=/usr \ + --cpu=${ARCH} \ + --disable-altivec \ + --disable-audio-jack \ + --disable-audio-pulseoutput \ + --disable-ccache \ + --disable-distcc \ + --disable-mythlogserver \ + --dvb-path=/usr/include \ + --enable-libmp3lame \ + --enable-libvpx \ + --enable-libxvid \ + --enable-libx264 \ + --enable-sdl \ + --python=python2 \ + --with-bindings=perl,python || return 1 + msg "Compiling mythtv" + make all || return 1 +} + +package() { + cd "${srcdir}/${pkgname}" + # basic install + make INSTALL_ROOT="${pkgdir}" install + # install contrib files + rsync -arp --exclude .svn --delete-excluded contrib ${pkgdir}/usr/share/mythtv/ || return 1 + # install database structure + rsync -arp --exclude .svn --delete-excluded database ${pkgdir}/usr/share/mythtv/ || return 1 + # install docs + rsync -arp --exclude .svn --delete-excluded docs ${pkgdir}/usr/share/mythtv/ || return 1 + + # patch the xml LinHES style + cp -r ${startdir}/menu-xml/*.xml ${pkgdir}/usr/share/mythtv/themes/defaultmenu/ + cd ${pkgdir}/usr/share/mythtv + patch -p0 < ${startdir}/menu-xml/mainmenu.xml.patch || return 1 + patch -p0 < ${startdir}/menu-xml/optical_menu.xml.patch || return 1 + patch -p0 < ${startdir}/menu-xml/library.xml.patch || return 1 + + # make mythtv log dir for old scripts that use it + mkdir -p ${pkgdir}/var/log/mythtv + chown 1000.1000 ${pkgdir}/var/log/mythtv + + #install recordings (was pretty) + mkdir -p ${pkgdir}/etc/cron.hourly/ + install -m0755 ${srcdir}/recordings ${pkgdir}/etc/cron.hourly/ +} + +md5sums=('e30b482dcd5f3e71c6419fd753bab2b1' + '41098e898361a5a3cde3eaae358482a8' + '928de4b070d9f3b784d55c0db415eaf3') diff --git a/abs/core/mythtv/stable-0.28/mythtv/__changelog b/abs/core/mythtv/stable-0.28/mythtv/__changelog new file mode 100644 index 0000000..91a959c --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/__changelog @@ -0,0 +1,2 @@ +update to 0.27-fixes + diff --git a/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 b/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 new file mode 100644 index 0000000..bfaad97 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/fixQTvirtualkeyboard.patch.28 @@ -0,0 +1,46 @@ +--- src/mythtv/libs/libmythui/mythmainwindow.cpp.orig 2016-03-15 17:30:19.608956780 +0000 ++++ src/mythtv/libs/libmythui/mythmainwindow.cpp 2016-03-15 17:37:17.368720092 +0000 +@@ -1458,6 +1458,7 @@ + #endif + if (currentWidget()) + { ++#ifdef Q_OS_MAC + // don't disable the current widget, instead we disable all its children + // on mac, disabling the current active widget entirely prevent keyboard to + // work on the newly opened widget. +@@ -1473,6 +1474,9 @@ + } + } + } ++#else ++ currentWidget()->setEnabled(false); ++#endif + #ifdef USE_OPENGL_QT5 + else + { +@@ -1506,8 +1510,6 @@ + if (!current) + { + current = this; +- // We're be to the main window, enable it just in case +- setEnabled(true); + #ifdef USE_OPENGL_QT5 + // Restore WA_PaintOnScreen, used by OpenGL GUI painter + setAttribute(Qt::WA_PaintOnScreen, d->m_bSavedPOS); +@@ -1515,6 +1517,7 @@ + QTimer::singleShot(2, d->paintwin, SLOT(update())); + #endif + } ++#ifdef Q_OS_MAC + else + { + QList list = current->findChildren(); +@@ -1529,6 +1532,8 @@ + } + } + current->raise(); ++#endif ++ current->setEnabled(true); + current->setFocus(); + current->setMouseTracking(true); + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/HOST_SETTINGS.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/HOST_SETTINGS.xml new file mode 100644 index 0000000..c9ec7fa --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/HOST_SETTINGS.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/dvd_backup.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/dvd_backup.xml new file mode 100644 index 0000000..2647d81 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/dvd_backup.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/game.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/game.xml new file mode 100644 index 0000000..293a9e6 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/game.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/info_menu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/info_menu.xml new file mode 100644 index 0000000..017f90b --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/info_menu.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/is.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/is.xml new file mode 100644 index 0000000..19efc34 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/is.xml @@ -0,0 +1,3 @@ + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/lh_backend_control.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/lh_backend_control.xml new file mode 100644 index 0000000..0b0cc17 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/lh_backend_control.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/library.xml.patch b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/library.xml.patch new file mode 100644 index 0000000..0c0177a --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/library.xml.patch @@ -0,0 +1,25 @@ +--- themes/defaultmenu/library.xml.orig 2014-11-26 20:21:35.092552944 +0000 ++++ themes/defaultmenu/library.xml 2014-11-26 20:22:43.103983263 +0000 +@@ -56,6 +56,13 @@ + + + ++ ++ + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes.xml new file mode 100644 index 0000000..fe7640d --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes_tools.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes_tools.xml new file mode 100644 index 0000000..feabe8e --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/linhes_tools.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mainmenu.xml.patch b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mainmenu.xml.patch new file mode 100644 index 0000000..3ddce0b --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mainmenu.xml.patch @@ -0,0 +1,15 @@ +--- themes/defaultmenu/mainmenu.xml.orig 2014-09-02 20:03:34.658600292 +0000 ++++ themes/defaultmenu/mainmenu.xml 2014-09-03 15:49:34.820056829 +0000 +@@ -45,9 +45,9 @@ + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythbackup.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythbackup.xml new file mode 100644 index 0000000..176591b --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythbackup.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythrestore.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythrestore.xml new file mode 100644 index 0000000..d37ba2b --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/mythrestore.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/optical_menu.xml.patch b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/optical_menu.xml.patch new file mode 100644 index 0000000..b836e85 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/optical_menu.xml.patch @@ -0,0 +1,23 @@ +--- themes/defaultmenu/optical_menu.xml.orig 2012-05-02 18:41:38.000000000 +0000 ++++ themes/defaultmenu/optical_menu.xml 2012-07-30 05:33:03.000000000 +0000 +@@ -17,6 +17,20 @@ + + + ++ ++ ++ ++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update.xml new file mode 100644 index 0000000..2d47e7d --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update2.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update2.xml new file mode 100644 index 0000000..4eee8cc --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/update2.xml @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml new file mode 100644 index 0000000..6b26d11 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/menu-xml/xmmenu.xml @@ -0,0 +1,574 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/abs/core/mythtv/stable-0.28/mythtv/myth_settings.patch b/abs/core/mythtv/stable-0.28/mythtv/myth_settings.patch new file mode 100644 index 0000000..8b7f731 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/myth_settings.patch @@ -0,0 +1,1972 @@ +commit 0bfb6515f1c6f10d4d9d5d7297ca56a18ac3c138 +Author: James Meyer +Date: Sun Nov 17 18:58:50 2013 -0600 + + mythutil updated with myth_settings for .27 + +diff --git a/mythtv/libs/libmythbase/mythcorecontext.cpp b/mythtv/libs/libmythbase/mythcorecontext.cpp +index e9cc880..4f7a3bd 100644 +--- a/mythtv/libs/libmythbase/mythcorecontext.cpp ++++ b/mythtv/libs/libmythbase/mythcorecontext.cpp +@@ -1262,6 +1262,90 @@ void MythCoreContext::ResetLanguage(void) + d->language.clear(); + } + ++//JM ADDED ++void MythCoreContext::savesettings_togroup (QString src_hostname, ++ QString saved_settingsgroupname ) ++{ ++ return d->m_database->savesettings_togroup(src_hostname, ++ saved_settingsgroupname); ++} ++ ++void MythCoreContext::deletesettings(QString delete_hostname, ++ QString saved_settingsgroupname) ++{ ++ return d->m_database->deletesettings(delete_hostname, ++ saved_settingsgroupname); ++} ++ ++QMap MythCoreContext::list_settingsgroupname() ++{ ++ return d->m_database->list_settingsgroupname(); ++} ++ ++QMap MythCoreContext::diff_settingsgroupname( ++ QString diff_hostname1, ++ QString diff_hostname2, ++ QStringList table_list) ++{ ++ return d->m_database->diff_settingsgroupname(diff_hostname1, ++ diff_hostname2, ++ table_list); ++} ++ ++void MythCoreContext::clonesettings(QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool is_full_clone, ++ QString dest_hostname) ++{ ++ return d->m_database->clonesettings(src_hostname, ++ saved_settingsgroupname, ++ table_list, ++ is_full_clone, ++ dest_hostname); ++} ++ ++void MythCoreContext::restoresettings(QString dest_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list ) ++{ ++ return d->m_database->restoresettings( dest_hostname, ++ saved_settingsgroupname, ++ table_list); ++} ++ ++void MythCoreContext::change_hostname(QString old_hostname, ++ QString new_hostname) ++{ ++ return d->m_database->change_hostname(old_hostname, new_hostname) ; ++} ++ ++bool MythCoreContext::settings_check(QString src_hostname, ++ QString saved_settingsgroupname) ++{ ++ return d->m_database->settings_check(src_hostname,saved_settingsgroupname); ++} ++ ++void MythCoreContext::import_settings(QMap vp_map, ++ QString table) ++{ ++ return d->m_database->import_settings(vp_map, table); ++} ++ ++ ++QMap > MythCoreContext::export_settings( ++ QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, bool skip_host ) ++{ ++ return d->m_database->export_settings(src_hostname, ++ saved_settingsgroupname, ++ table_list , skip_host ); ++} ++ ++//END JM ADDED ++ ++ + void MythCoreContext::InitLocale(void ) + { + if (!d->m_locale) +diff --git a/mythtv/libs/libmythbase/mythcorecontext.h b/mythtv/libs/libmythbase/mythcorecontext.h +index aed83d7..3f0de5e 100644 +--- a/mythtv/libs/libmythbase/mythcorecontext.h ++++ b/mythtv/libs/libmythbase/mythcorecontext.h +@@ -198,7 +198,42 @@ class MBASE_PUBLIC MythCoreContext : public QObject, public MythObservable, publ + void emitTVPlaybackUnpaused(void) { emit TVPlaybackUnpaused(); } + void emitTVPlaybackAborted(void) { emit TVPlaybackAborted(); } + void emitTVPlaybackPlaying(void) { emit TVPlaybackPlaying(); } +- ++ ++ //JM ADDED ++ void savesettings_togroup(QString src_hostname, ++ QString saved_settingsgroupname ); ++ ++ void deletesettings(QString delete_hostname, ++ QString saved_settingsgroupname); ++ ++ QMap list_settingsgroupname(); ++ QMap diff_settingsgroupname(QString diff_hostname1, ++ QString diff_hostname2, ++ QStringList table_list); ++ ++ void clonesettings(QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool is_full_clone = true, ++ QString dest_hostname=""); ++ ++ void restoresettings (QString dest_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list); ++ ++ void change_hostname (QString old_hostname, QString new_hostname); ++ ++ bool settings_check (QString src_hostname ,QString saved_settingsgroupname); ++ void import_settings(QMap vp_map, QString table); ++ ++ QMap > export_settings( ++ QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool skip_host = false ); ++ //END JM ADDED ++ ++ + signals: + void TVPlaybackStarted(void); + //// TVPlaybackStopped signal should be used in combination with +@@ -211,6 +246,7 @@ class MBASE_PUBLIC MythCoreContext : public QObject, public MythObservable, publ + void TVPlaybackAboutToStart(void); + void TVPlaybackPlaying(void); + ++ + private: + MythCoreContextPrivate *d; + +diff --git a/mythtv/libs/libmythbase/mythdb.cpp b/mythtv/libs/libmythbase/mythdb.cpp +index e60fce0..ed3bdf7 100644 +--- a/mythtv/libs/libmythbase/mythdb.cpp ++++ b/mythtv/libs/libmythbase/mythdb.cpp +@@ -896,6 +896,1015 @@ void MythDB::WriteDelayedSettings(void) + } + } + ++//JM ADDED ++void MythDB::savesettings_togroup(QString src_hostname, ++ QString saved_settingsgroupname ) ++{ ++ LOG(VB_GENERAL, LOG_ERR, QString("Using hostname of : %1") ++ .arg(src_hostname)); ++ LOG(VB_GENERAL, LOG_ERR, QString("Saving to group: %1") ++ .arg(saved_settingsgroupname)); ++ if ( settings_check( src_hostname , "current" ) ) ++ { ++ QStringList table_list; ++ QString hostname_clause; ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ table_list.append("jumppoints"); ++ if ( src_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ ++ foreach (QString table, table_list) ++ { ++ QString dest_tablename = table +"_" + saved_settingsgroupname ; ++ create_new_table(dest_tablename,table); ++ ++ QString query_string; ++ // Remove old saved values ++ MSqlQuery query(MSqlQuery::InitCon()); ++ query_string = QString("DELETE FROM %1 WHERE %2") ++ .arg(dest_tablename) ++ .arg(hostname_clause); ++ ++ //query_string = QString("DELETE FROM %1 WHERE " ++ // "hostname = :HOSTNAME").arg(dest_tablename); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" ,src_hostname); ++ query.exec(); ++ ++ //insert all new settings ++ query_string = QString("REPLACE INTO %1 " ++ "SELECT * from %2 where %3") ++ .arg(dest_tablename) ++ .arg(table) ++ .arg(hostname_clause); ++// query_string = QString("REPLACE INTO %1 " ++// "SELECT * from %2 where hostname = :HOSTNAME)") ++// .arg(dest_tablename) ++// .arg(table); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",src_hostname); ++ query.exec(); ++ } ++ } ++ else ++ LOG(VB_GENERAL| VB_STDIO|VB_FLUSH, LOG_ERR, ++ QString("Couldn't find settings for: %1 \n").arg(src_hostname)); ++ return; ++ ++}; ++ ++void MythDB::deletesettings(QString delete_hostname, ++ QString saved_settingsgroupname) ++{ ++ LOG(VB_GENERAL, LOG_ERR, QString("Using hostname of : %1") ++ .arg(delete_hostname)); ++ LOG(VB_GENERAL, LOG_ERR, QString("Deleting: %1") ++ .arg(saved_settingsgroupname)); ++ int tempItem; ++ QString src_tablename; ++ QStringList table_list; ++ ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ table_list.append("jumppoints"); ++ QString hostname_clause; ++ if ( delete_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ ++ foreach (QString table, table_list) ++ { ++ src_tablename = find_group_table_name(table, saved_settingsgroupname); ++ MSqlQuery query(MSqlQuery::InitCon()); ++ // Remove old saved values ++ if ( does_table_exist(src_tablename)) ++ { ++ QString query_string = QString("DELETE from %1 " ++ "WHERE %2") ++ .arg(src_tablename) ++ .arg(hostname_clause); ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" ,delete_hostname); ++ query.exec(); ++ ++ //check if ok to delete table ++ query_string = QString("SELECT count(*) from %1") ++ .arg(src_tablename); ++ query.prepare(query_string); ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ query.next(); ++ tempItem = query.value(0).toInt(); ++ if ( tempItem == 0 ) ++ drop_temp_table(src_tablename); ++ } ++ } ++ else ++ LOG(VB_GENERAL, LOG_ERR, ++ QString("Couldn't find table: %1").arg(src_tablename)); ++ } ++ return; ++}; // end delete settings ++ ++ ++QMap MythDB::list_settingsgroupname() ++{ ++ //Returns a QMAP of "settings_groups: hostname" ++ MSqlQuery query(MSqlQuery::InitCon()); ++ MSqlQuery subquery(MSqlQuery::InitCon()); ++ QString tempItem; ++ QString temp_hostnameItem; ++ QStringList hostname_list; ++ QMap return_list; ++ QString full_table_name; ++ query.prepare( "show tables like \"settings%\" " ); ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ full_table_name = query.value(0).toString(); ++ tempItem=query.value(0).toString().remove(QRegExp("settings_")); ++ if ( tempItem != "distro_default" ) ++ { ++ //loop over tables looking for hostnames ++ QString query_string = QString("SELECT DISTINCT " ++ "hostname from %1") ++ .arg(full_table_name); ++ subquery.prepare(query_string); ++ ++ if (subquery.exec() && subquery.isActive() ++ && subquery.size() > 0) ++ { ++ while (subquery.next()) ++ { ++ temp_hostnameItem = subquery.value(0).toString(); ++ hostname_list.append(temp_hostnameItem); ++ } ++ } ++ //Special case of naming for the settings table; ++ //This only affects output. ++ if ( tempItem == "settings" ) ++ return_list["current"] = hostname_list; ++ else ++ return_list[tempItem] = hostname_list; ++ ++ //reset hostname_list for the next group ++ hostname_list = QStringList(); ++ } ++ } ++ } ++ return return_list; ++}; // end list_settingsgroupname ++ ++QMap MythDB::diff_settingsgroupname( ++ QString diff_hostname1 , ++ QString diff_hostname2, ++ QStringList table_list ) ++{ ++ // Returns a QMAP of tablename : diff results ++ LOG(VB_GENERAL, LOG_ERR, QString("Comparing settings for:")); ++ LOG(VB_GENERAL, LOG_ERR, QString("host 1: %1").arg(diff_hostname1)); ++ LOG(VB_GENERAL, LOG_ERR, QString("host 2: %1").arg(diff_hostname2)); ++ ++ QString qstr; ++ QString tempItem; ++ QString tempString; ++ ++ QStringList diff_list; ++ QStringList settings_list; ++ QStringList keybinding_list; ++ ++ QMap return_list; ++ if ( table_list.isEmpty() ) ++ { ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ } ++ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ foreach (QString table, table_list) ++ { ++ if ( table == "settings") ++ { ++ ++ qstr= "SELECT distinct settings.value, :DIFF_HOSTNAME1 AS `hostname`, settings_a.data, :DIFF_HOSTNAME2 AS `hostname`" ++ " , settings_b.data FROM settings LEFT JOIN settings AS settings_a ON settings_a.value = settings.value AND settings_a.hostname = :DIFF_HOSTNAME1" ++ " LEFT JOIN settings AS settings_b ON settings_b.value = settings.value AND settings_b.hostname = :DIFF_HOSTNAME2" ++ " WHERE settings_a.data != settings_b.data OR " ++ " (settings_a.data IS NULL AND settings_b.data IS NOT NULL) OR (settings_a.data IS NOT NULL AND settings_b.data IS NULL);"; ++ ++ query.prepare(qstr); ++ query.bindValue(":DIFF_HOSTNAME1" , diff_hostname1); ++ query.bindValue(":DIFF_HOSTNAME2" , diff_hostname2); ++ ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ tempString=""; ++ //value ++ tempItem = query.value(0).toString(); ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //hostname_1 ++ tempItem = query.value(1).toString(); ++ if (tempItem.isEmpty()) ++ tempItem=diff_hostname1; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //data ++ tempItem = query.value(2).toString(); ++ if (tempItem.isEmpty()) ++ tempItem="NULL"; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //hostname_2 ++ tempItem = query.value(3).toString(); ++ if (tempItem.isEmpty()) ++ tempItem=diff_hostname2; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //data ++ tempItem = query.value(4).toString(); ++ if (tempItem.isEmpty()) ++ tempItem="NULL"; ++ tempString.append(tempItem); ++ ++ settings_list.append(tempString); ++ } ++ return_list["Settings"] = settings_list; ++ } ++ } ++ else if ( table == "keybindings") ++ { ++ ++ qstr="SELECT distinct keybindings.context, keybindings.action, :DIFF_HOSTNAME1 AS `hostname`, keybindings_a.keylist, :DIFF_HOSTNAME2 AS `hostname`, keybindings_b.keylist FROM keybindings " ++ " LEFT JOIN keybindings AS keybindings_a ON keybindings_a.context = keybindings.context AND keybindings_a.action = keybindings.action " ++ " AND keybindings_a.hostname = :DIFF_HOSTNAME1 " ++ " LEFT JOIN keybindings AS keybindings_b ON keybindings_b.context = keybindings.context " ++ " AND keybindings_b.action = keybindings.action AND keybindings_b.hostname = :DIFF_HOSTNAME2 " ++ " WHERE keybindings_a.keylist != keybindings_b.keylist OR " ++ " (keybindings_a.keylist IS NULL AND keybindings_b.keylist IS NOT NULL) OR (keybindings_a.keylist IS NOT NULL AND keybindings_b.keylist IS NULL);"; ++ query.prepare(qstr); ++ query.bindValue(":DIFF_HOSTNAME1" , diff_hostname1); ++ query.bindValue(":DIFF_HOSTNAME2" , diff_hostname2); ++ ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ tempString=""; ++ //context ++ tempItem = query.value(0).toString(); ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //action ++ tempItem = query.value(1).toString(); ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //hostname ++ tempItem = query.value(2).toString(); ++ if (tempItem.isEmpty()) ++ tempItem=diff_hostname1; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //keylist ++ tempItem = query.value(3).toString(); ++ if (tempItem.isEmpty()) ++ tempItem="NULL"; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //hostname ++ tempItem = query.value(4).toString(); ++ if (tempItem.isEmpty()) ++ tempItem=diff_hostname2; ++ tempString.append(tempItem); ++ tempString.append("|"); ++ ++ //keylist ++ tempItem = query.value(5).toString(); ++ if (tempItem.isEmpty()) ++ tempItem="NULL"; ++ tempString.append(tempItem); ++ keybinding_list.append(tempString); ++ } ++ return_list["Keybindings"] = keybinding_list; ++ } ++ } ++ ++ } ++ return return_list; ++}; //end diff_settingsgroupname ++ ++void MythDB::clonesettings(QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool is_full_clone, QString dest_hostname) ++{ ++ LOG(VB_GENERAL, LOG_ERR, QString("Using src hostname of : %1") ++ .arg(src_hostname)); ++ LOG(VB_GENERAL, LOG_ERR, QString("Using dest hostname of : %1") ++ .arg(dest_hostname)); ++ LOG(VB_GENERAL, LOG_ERR, QString("Cloning setting group: %1") ++ .arg(saved_settingsgroupname)); ++ LOG(VB_GENERAL, LOG_ERR, QString("Full Copy : %1") ++ .arg(is_full_clone)); ++ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ QStringList::Iterator it; ++ QString current_table; ++ QString dest_tablename; ++ QString temptable; ++ ++ if ( table_list.isEmpty() ) ++ { ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ table_list.append("jumppoints"); ++ } ++ ++ for ( it = table_list.begin(); it != table_list.end(); ++it ) ++ { ++ current_table = *it ; ++ dest_tablename = find_group_table_name(current_table, ++ saved_settingsgroupname); ++ ++ if ( does_table_exist(dest_tablename)) ++ { ++ // create temp table for merging settings ++ temptable="temp_table_" + dest_tablename; ++ create_temp_table(temptable, current_table ); ++ ++ // copy in stored settings ++ QString query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2 where hostname = :HOSTNAME)") ++ .arg(temptable) ++ .arg(dest_tablename); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",src_hostname ); ++ query.exec(); ++ ++ // update hostname for dest_hostname ++ query_string = QString("UPDATE %1 set hostname = :HOSTNAME") ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" , dest_hostname ); ++ query.exec(); ++ ++ //if not full clone remove HOST% settings from temp table; ++ if ( current_table == "settings" && !is_full_clone) ++ { ++ query_string = QString("DELETE FROM %1 WHERE " ++ "hostname=:HOSTNAME and value like 'HOST%' " ) ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.bindValue( ":HOSTNAME" , dest_hostname ); ++ query.exec(); ++ } ++ ++ //remove current settings from dest table, ++ //if not full clone, then leave HOST% ++ //Need to remove because the old table allows for duplicates ++ ++ if ( current_table == "settings" && !is_full_clone) ++ query_string = QString ("DELETE FROM %1 WHERE " ++ "hostname = :HOSTNAME " ++ "and value not like 'HOST%'") ++ .arg(dest_tablename); ++ ++ else ++ query_string = QString ("DELETE FROM %1 WHERE " ++ "hostname = :HOSTNAME ") ++ .arg(dest_tablename); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",dest_hostname); ++ query.exec(); ++ ++ // copy new settings from temp to current ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2)") ++ .arg(dest_tablename) ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.exec(); ++ ++ // drop temptable ++ drop_temp_table(temptable); ++ } ++ else ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Couldn't find table: %1") ++ .arg(dest_tablename)); ++ } ++}; //end clonesettings ++ ++void MythDB::restoresettings (QString dest_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list ) ++{ ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Restoring Settings:")); ++ LOG(VB_GENERAL, LOG_NOTICE, QString(" src: %1") ++ .arg(saved_settingsgroupname)); ++ LOG(VB_GENERAL, LOG_NOTICE, QString(" dest:%1") ++ .arg(dest_hostname)); ++ ++ QString hostname_clause; ++ if ( dest_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ ++ bool table_check; ++ if ( saved_settingsgroupname == "distro_default" ) ++ table_check = settings_check ( "distro_default" , saved_settingsgroupname ); ++ else ++ table_check = settings_check ( dest_hostname , saved_settingsgroupname ); ++ ++ ++ if ( table_check == true ) ++ { ++ MSqlQuery query(MSqlQuery::InitCon()); ++ QStringList::Iterator it; ++ QString current_table; ++ if ( table_list.isEmpty() ) ++ { ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ table_list.append("jumppoints"); ++ } ++ ++ for ( it = table_list.begin(); it != table_list.end(); ++it ) ++ { ++ current_table = *it ; ++ //find tablenames to use ++ QString src_tablename = find_group_table_name(current_table, ++ saved_settingsgroupname); ++ ++ QString temptable="temp_table_" + src_tablename; ++ if ( ! does_table_exist(src_tablename)) ++ { ++ LOG(VB_GENERAL, LOG_NOTICE, QString("table does not exist: %1") ++ .arg(src_tablename)); ++ continue; ++ } ++ // create temp table for merging settings ++ create_temp_table(temptable, current_table ); ++ ++ //could copy in current settings here to account for new stuff ++ ++ ++ ++ // copy in stored settings ++ QString query_string; ++ if ( saved_settingsgroupname == "distro_default" ) ++ { //special case for restoring default settings ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2 WHERE %3)") ++ .arg(temptable) ++ .arg(src_tablename) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", "distro_default" ); ++ query.exec(); ++ ++ // update hostname in temp table from distro_default ++ query_string = QString("UPDATE %1 set hostname = :HOSTNAME") ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" , dest_hostname ); ++ query.exec(); ++ ++ } ++ else ++ { //normal use case ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2 WHERE %3)") ++ .arg(temptable) ++ .arg(src_tablename) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",dest_hostname ); ++ query.exec(); ++ } ++ ++ //Remove current settings. ++ //Need to remove because the old table allows for duplicates ++ query_string = QString("DELETE FROM %1 WHERE " ++ "%2") ++ .arg(current_table) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME",dest_hostname); ++ query.exec(); ++ ++ // copy new settings from temp to current ++ query_string = QString("REPLACE INTO %1 " ++ "(SELECT * from %2)") ++ .arg(current_table) ++ .arg(temptable); ++ ++ query.prepare(query_string); ++ query.exec(); ++ // drop temptable ++ drop_temp_table(temptable); ++ } ++ } ++}; //end restore settings ++ ++void MythDB::change_hostname (QString old_hostname, QString new_hostname) ++{ ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Changing hostname from %1 -> %2") ++ .arg(old_hostname) ++ .arg(new_hostname)); ++ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ MSqlQuery sub_query(MSqlQuery::InitCon()); ++ query.prepare( "SHOW TABLES" ); ++ ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ QString table_name = query.value(0).toString(); ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Scanning %1") ++ .arg(table_name)); ++ ++ // LOOP OVER TABLES, CHECK IF IT HAS A HOSTNAME FIELD ++ QString query_string=QString("SHOW COLUMNS from %1 " ++ "where field='hostname'") ++ .arg(table_name); ++ sub_query.prepare(query_string); ++ ++ if (sub_query.exec() && sub_query.size() > 0) ++ { //update hostname ++ LOG(VB_GENERAL, LOG_NOTICE, QString(" Updating hostname in: %1") ++ .arg(table_name)); ++ query_string = QString("UPDATE %1 SET hostname = :NEW_HOSTNAME " ++ "WHERE hostname = :OLD_HOSTNAME") ++ .arg(table_name); ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":NEW_HOSTNAME" , new_hostname); ++ sub_query.bindValue(":OLD_HOSTNAME" , old_hostname); ++ sub_query.exec(); ++ } ++ } ++ } ++ ++ ++ ++ ++ ++ ++} ++ ++bool MythDB::settings_check(QString src_hostname, ++ QString saved_settingsgroupname) ++{ ++ int tempItem; ++ bool returncode = false ; ++ QString table="settings"; ++ ++ QString tablename = find_group_table_name(table, saved_settingsgroupname); ++ QString hostname_clause; ++ if ( src_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ ++ if (does_table_exist (tablename)) ++ { ++ MSqlQuery query(MSqlQuery::InitCon()); ++ QString query_string = QString("SELECT COUNT(data) from %1 " ++ "WHERE %2") ++ .arg(tablename) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" , src_hostname ); ++ ++ if (query.exec() && query.isActive() && query.size() > 0 ) ++ { ++ while (query.next()) ++ { ++ tempItem = query.value(0).toInt(); ++ if ( tempItem >= 1 ) ++ returncode = true; ++ else ++ { ++ LOG(VB_GENERAL, LOG_NOTICE, ++ QString("Group %1 does not contain" ++ " valid settings") ++ .arg(saved_settingsgroupname)); ++ } ++ } ++ } ++ } ++ else ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Couldn't find table: %1") ++ .arg(tablename)); ++ return returncode; ++}; // end settings_check ++ ++void MythDB::import_settings(QMap vp_map, ++ QString table) ++{ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ ++ //IMPORT SETTINGS TABLE ++ if (table.startsWith("settings")) ++ { ++ if ( table != "settings" ) ++ create_new_table(table,"settings"); ++ QString hostname = vp_map.value("hostname"); ++ QString value = vp_map.value("value"); ++ QString data = vp_map.value("data"); ++ ++ QString hostname_clause; ++ QVariant import_hostname = QVariant(QVariant::String); ++ ++ if ( hostname.isEmpty()) ++ hostname_clause = "hostname IS NULL"; ++ else ++ { ++ hostname_clause ="hostname = :HOSTNAME"; ++ import_hostname = hostname; ++ } ++ ++ QString query_string=QString("SELECT value, data, hostname " ++ "FROM %1 " ++ "WHERE %2 AND value = :VALUE " ++ "ORDER BY value") ++ .arg(table) ++ .arg(hostname_clause); ++ ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", hostname); ++ query.bindValue(":VALUE", value); ++ ++ // if already exisiting records then update, otherwise insert ++ if (query.exec() && query.isActive()) ++ { ++ MSqlQuery sub_query(MSqlQuery::InitCon()); ++ if ( query.size() > 0 ) ++ { ++ query_string = QString("UPDATE " ++ "%1 " ++ "set data = :DATA " ++ "WHERE %2 AND " ++ "value = :VALUE ") ++ .arg(table) ++ .arg(hostname_clause); ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", import_hostname); ++ sub_query.bindValue(":VALUE", value); ++ sub_query.bindValue(":DATA", data); ++ sub_query.exec(); ++ } ++ else ++ { ++ query_string = QString("INSERT INTO " ++ " %1 " ++ "(value,data,hostname) " ++ "VALUES ( :VALUE , :DATA , :HOSTNAME)").arg(table); ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", import_hostname); ++ sub_query.bindValue(":VALUE", value); ++ sub_query.bindValue(":DATA", data); ++ sub_query.exec(); ++ } ++ } ++ } ++ //KEYBINDINGS TABLE ++ else if (table.startsWith("keybindings")) ++ { ++ if ( table != "keybindings" ) ++ create_new_table(table,"keybindings"); ++ QString hostname = vp_map.value("hostname"); ++ QString context = vp_map.value("context"); ++ QString action = vp_map.value("action"); ++ QString description = vp_map.value("description"); ++ QString keylist = vp_map.value("keylist"); ++ ++ QString query_string=QString("SELECT context,action,hostname " ++ "FROM %1 " ++ "WHERE hostname = :HOSTNAME AND " ++ "context = :CONTEXT " ++ "AND action = :ACTION ").arg(table); ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", hostname); ++ query.bindValue(":CONTEXT", context); ++ query.bindValue(":ACTION", action); ++ ++ if (query.exec() && query.isActive()) ++ { ++ MSqlQuery sub_query(MSqlQuery::InitCon()); ++ if ( query.size() > 0 ) ++ { ++ query_string = QString("UPDATE " ++ " %1 " ++ "set keylist = :KEYLIST " ++ "WHERE hostname = :HOSTNAME AND " ++ "context = :CONTEXT " ++ "AND action = :ACTION ").arg(table); ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":CONTEXT", context); ++ sub_query.bindValue(":ACTION", action); ++ sub_query.exec(); ++ } ++ else ++ { ++ query_string = QString("INSERT INTO " ++ " %1 " ++ " (context , action , description , keylist , hostname) " ++ " VALUES( " ++ " :CONTEXT ," ++ " :ACTION , " ++ " :DESCRIPTION , " ++ " :KEYLIST , " ++ " :HOSTNAME)").arg(table) ; ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":CONTEXT", context); ++ sub_query.bindValue(":ACTION", action); ++ sub_query.bindValue(":DESCRIPTION", description); ++ sub_query.exec(); ++ } ++ } ++ } ++ //JUMP POINTS ++ else if (table.startsWith("jumppoints")) ++ { ++ if ( table != "jumppoints" ) ++ create_new_table(table,"jumppoints"); ++ QString hostname = vp_map.value("hostname"); ++ QString description = vp_map.value("description"); ++ QString destination = vp_map.value("destination"); ++ QString keylist = vp_map.value("keylist"); ++ ++ QString query_string=QString("SELECT destination, keylist " ++ "FROM %1 " ++ "WHERE hostname = :HOSTNAME AND " ++ "destination = :DESTINATION " ++ "AND keylist = :KEYLIST ").arg(table); ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME", hostname); ++ query.bindValue(":DESTINATION", destination); ++ query.bindValue(":KEYLIST", keylist); ++ ++ if (query.exec() && query.isActive()) ++ { ++ MSqlQuery sub_query(MSqlQuery::InitCon()); ++ if ( query.size() > 0 ) ++ { ++ query_string = QString("UPDATE " ++ " %1 " ++ "set keylist = :KEYLIST " ++ "WHERE hostname = :HOSTNAME AND " ++ "destination = :DESTINATION ").arg(table); ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":DESTINATION", destination); ++ sub_query.exec(); ++ } ++ else ++ { ++ query_string = QString("INSERT INTO " ++ " %1 " ++ " (description , destination, keylist , hostname) " ++ " VALUES( " ++ " :DESCRIPTION ," ++ " :DESTINATION , " ++ " :KEYLIST , " ++ " :HOSTNAME)").arg(table) ; ++ ++ sub_query.prepare(query_string); ++ sub_query.bindValue(":HOSTNAME", hostname); ++ sub_query.bindValue(":KEYLIST", keylist); ++ sub_query.bindValue(":DESTINATION", destination); ++ sub_query.bindValue(":DESCRIPTION", description); ++ sub_query.exec(); ++ } ++ } ++ } ++}; //end import_settings ++ ++QMap > ++ MythDB::export_settings(QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, bool skip_host ) ++{ ++ QMap > result_set; ++ QStringList::Iterator it; ++ QString current_table; ++ int record_count = 0; ++ ++ if ( table_list.isEmpty() ) ++ { ++ table_list.append("settings"); ++ table_list.append("keybindings"); ++ table_list.append("jumppoints"); ++ } ++ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ QString query_string; ++ ++ //loop over tablelist ++ for ( it = table_list.begin(); it != table_list.end(); ++it ) ++ { ++ current_table = *it ; ++ QString sub_sql; ++ QStringList fields; ++ QString field_query; ++ ++ QString table_name = find_group_table_name(current_table, ++ saved_settingsgroupname); ++ ++ QString hostname_clause; ++ if ( src_hostname == "GLOBAL" ) ++ hostname_clause = "hostname IS NULL"; ++ else ++ hostname_clause ="hostname = :HOSTNAME"; ++ ++ // find field names ++ query_string = QString("SHOW COLUMNS from %1").arg(table_name); ++ query.prepare(query_string); ++ ++ //build up field name vars ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ if (! field_query.isEmpty()) ++ field_query +=','; ++ QString tempItem = query.value(0).toString(); ++ fields.append(tempItem); ++ field_query += tempItem; ++ } ++ } ++ // when working with settings table skip HOST if skip_host is true ++ if ( current_table == "settings" && skip_host == true ) ++ { ++ QString skip_host_clause; ++ skip_host_clause = " VALUE not like 'HOST%' AND DATA not like 'HardwareProfile%UUID'" ; ++ query_string = QString("SELECT %1 FROM %2 WHERE %3 AND %4") ++ .arg(field_query) ++ .arg(table_name) ++ .arg(hostname_clause) ++ .arg(skip_host_clause); ++ ++ } ++ else ++ { ++ query_string = QString("SELECT %1 FROM %2 WHERE %3") ++ .arg(field_query) ++ .arg(table_name) ++ .arg(hostname_clause); ++ } ++ query.prepare(query_string); ++ query.bindValue(":HOSTNAME" , src_hostname); ++ ++ //looping over each record in the table query ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ //construct qmap of elements ++ //add table name ++ QMap value_pair; ++ value_pair["table"]=table_name; ++ ++ for ( int i=0 ; i < fields.size();i++ ) ++ { ++ QString tempvalue = fields[i]; ++ QString tempItem = query.value(i).toString(); ++ value_pair[tempvalue]=tempItem; ++ } ++ result_set[QString(record_count)] = value_pair; ++ record_count++; ++ } ++ } ++ ++ } // end table loop ++ return result_set; ++}; //end export_settings ++ ++ ++void MythDB::create_new_table (QString create_table_name,QString like_name) ++{ ++ if ( ! does_table_exist(create_table_name)) ++ { ++ MSqlQuery query(MSqlQuery::InitCon()); ++ QString query_string = QString("CREATE TABLE %1 like %2") ++ .arg(create_table_name) ++ .arg(like_name); ++ ++ query.prepare(query_string); ++ query.exec(); ++ } ++ else ++ LOG(VB_GENERAL, LOG_NOTICE, QString("Table is already present," ++ "will not create it: %1") ++ .arg(create_table_name)); ++}; ++ ++ ++void MythDB::drop_temp_table (QString table_name) ++{ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ if (table_name == "settings" | table_name == "keybindings" | table_name == "jumppoints") ++ return; ++ QString query_string = QString("DROP TABLE %1").arg(table_name); ++ query.prepare(query_string); ++ query.exec(); ++ return; ++} ++ ++void MythDB::create_temp_table (QString create_table_name,QString like_name) ++{ ++ MSqlQuery query(MSqlQuery::InitCon()); ++ create_new_table(create_table_name,like_name); ++ QString query_string; ++ if ( like_name == "settings") ++ { ++ query_string = QString ("ALTER TABLE %1 ADD UNIQUE( value)") ++ .arg(create_table_name); ++ query.prepare(query_string); ++ query.exec(); ++ } ++ ++ query_string = QString("TRUNCATE %1").arg(create_table_name); ++ query.prepare(query_string); ++ query.exec(); ++ return; ++} ++ ++bool MythDB::does_table_exist(QString table_name) ++{ ++ bool table_exist = false; ++ QString full_table_name; ++ MSqlQuery query(MSqlQuery::InitCon()); ++ ++ query.prepare( "SHOW TABLES" ); ++ if (query.exec() && query.isActive() && query.size() > 0) ++ { ++ while (query.next()) ++ { ++ full_table_name = query.value(0).toString(); ++ if (table_name == full_table_name) ++ { ++ table_exist = true; ++ break; ++ } ++ } ++ } ++ return table_exist; ++}; ++ ++ ++QString MythDB::find_group_table_name(QString current_table, ++ QString saved_settingsgroupname) ++{ ++ QString table_name; ++ if ( saved_settingsgroupname.toLower() == "current" ) ++ table_name = current_table ; ++ else ++ table_name = current_table + "_" + saved_settingsgroupname ; ++ ++ return table_name; ++}; ++//END JM ADDED ++ + /** + * \brief Set a flag indicating we have successfully connected to the database + */ +diff --git a/mythtv/libs/libmythbase/mythdb.h b/mythtv/libs/libmythbase/mythdb.h +index ac2a8ec..f3689a5 100644 +--- a/mythtv/libs/libmythbase/mythdb.h ++++ b/mythtv/libs/libmythbase/mythdb.h +@@ -74,6 +74,49 @@ class MBASE_PUBLIC MythDB + + void WriteDelayedSettings(void); + ++ //JM ADDED ++ void savesettings_togroup(QString src_hostname, ++ QString saved_settingsgroupname ); ++ void deletesettings(QString delete_hostname, ++ QString saved_settingsgroupname); ++ ++ QMap list_settingsgroupname(); ++ ++ QMap diff_settingsgroupname(QString diff_hostname1, ++ QString diff_hostname2, ++ QStringList table_list); ++ ++ void clonesettings(QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool is_full_clone = true, ++ QString dest_hostname=""); ++ ++ void restoresettings (QString dest_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list); ++ ++ void change_hostname (QString old_hostname, QString new_hostname); ++ bool settings_check (QString src_hostname, QString saved_settingsgroupname); ++ void import_settings(QMap vp_map, QString table); ++ ++ ++ QMap > export_settings( ++ QString src_hostname, ++ QString saved_settingsgroupname, ++ QStringList table_list, ++ bool skip_host = false); ++ ++ void create_new_table (QString create_table_name,QString like_name); ++ void drop_temp_table (QString table_name); ++ void create_temp_table (QString create_table_name,QString like_name); ++ bool does_table_exist(QString table_name); ++ QString find_group_table_name(QString current_table, ++ QString saved_settingsgroupname); ++ //END JM ADDED ++ ++ ++ + void SetHaveDBConnection(bool connected); + void SetHaveSchema(bool schema); + bool HaveSchema(void) const; +diff --git a/mythtv/programs/mythutil/commandlineparser.cpp b/mythtv/programs/mythutil/commandlineparser.cpp +index 902314d..d86b548 100644 +--- a/mythtv/programs/mythutil/commandlineparser.cpp ++++ b/mythtv/programs/mythutil/commandlineparser.cpp +@@ -144,6 +144,37 @@ void MythUtilCommandLineParser::LoadArguments(void) + << add("--print-notification-template", "printntemplate", false, + "Print the template to be sent to the frontend", "") + ->SetGroup("Messaging") ++ ++ //settingsutil.cpp ++ << add("--save-settings", "savesettings", false, ++ "Save current settings", "") ++ ->SetGroup("Settings") ++ << add("--delete-settings", "deletesettings", false, ++ "Delete current settings", "") ++ ->SetGroup("Settings") ++ << add("--restore-settings", "restoresettings", false, ++ "Restore settings from previous backup", "") ++ ->SetGroup("Settings") ++ << add("--list-groups", "listgroups", false, ++ "List hosts and groups of settings", "") ++ ->SetGroup("Settings") ++ << add("--copy-settings", "copysettings", false, ++ "Copy or Clone settings from one host to another", "") ++ ->SetGroup("Settings") ++ << add("--diff-settings", "diffsettings", false, ++ "Show settings that are different between two hosts", "") ++ ->SetGroup("Settings") ++ << add("--change-hostname", "changehostname", false, ++ "Change the hostname", "") ++ ->SetGroup("Settings") ++ << add("--import-settings", "importsettings", false, ++ "import settings", "") ++ ->SetRequiredChild("infile") ++ ++ << add("--export-settings", "exportsettings", false, ++ "export settings", "") ++ ->SetRequiredChild("outfile") ++ + + // musicmetautils.cpp + << add("--scanmusic", "scanmusic", false, +@@ -194,6 +225,59 @@ void MythUtilCommandLineParser::LoadArguments(void) + add("--type", "type", "type", "(optional) type of notification (normal, error, warning, check, busy", "") + ->SetChildOf("notification"); + ++ //settingsutils.cpp ++ add("--groupname", "groupname", "", "Group of settings name", "") ++ ->SetRequiredChildOf("savesettings") ++ ->SetRequiredChildOf("restoresettings") ++ ->SetRequiredChildOf("deletesettings") ++ ->SetChildOf("copysettings"); ++ ++ add("--hostname", "hostname", "", "System name to save/restore settings", "") ++ ->SetChildOf("savesettings") ++ ->SetChildOf("restoresettings") ++ ->SetChildOf("copysettings") ++ ->SetChildOf("deletesettings") ++ ->SetChildOf("exportsettings") ++ ->SetChildOf("importsettings"); ++ ++ add("--host_1", "host_1", "", "First host in compare list", "") ++ ->SetRequiredChildOf("diffsettings"); ++ ++ add("--host_2", "host_2", "", "Second host in compare list", "") ++ ->SetRequiredChildOf("diffsettings"); ++ ++ ++ add("--tablelist", "table_list", "", "List of tables to operate on " ++ "[keybindings,settings]", "") ++ ->SetChildOf("diffsettings") ++ ->SetChildOf("restoresettings") ++ ->SetChildOf("copysettings") ++ ->SetChildOf("exportsettings"); ++ ++ add("--clone", "fullclone", false, "Enable copy of all settings, " ++ "including those that are unique to each system.", "") ++ ->SetChildOf("copysettings"); ++ ++ ++ add("--old-host", "oldhost", "", "Hostname to change", "") ++ ->SetRequiredChildOf("changehostname"); ++ ++ add("--new-host", "newhost", "", "New hostname", "") ++ ->SetRequiredChildOf("changehostname") ++ ->SetRequiredChildOf("copysettings"); ++ ++ add("--format", "format", false, "Format output of differences", "") ++ ->SetChildOf("diffsettings"); ++ add("--distro-default", "distro-default", false, "Export settings for" ++ "import into the default table", "") ++ ->SetChildOf("exportsettings"); ++ add("--generic", "generic", false, "export settings without saving " ++ "the hostname", "") ++ ->SetChildOf("exportsettings"); ++ ++ ++ ++ + // Generic Options used by more than one utility + addRecording(); + addInFile(true); +diff --git a/mythtv/programs/mythutil/main.cpp b/mythtv/programs/mythutil/main.cpp +index 0bc49f2..faada3d 100644 +--- a/mythtv/programs/mythutil/main.cpp ++++ b/mythtv/programs/mythutil/main.cpp +@@ -26,6 +26,7 @@ + #include "musicmetautils.h" + #include "recordingutils.h" + #include "signalhandling.h" ++#include "settingsutils.h" + + + int main(int argc, char *argv[]) +@@ -110,6 +111,7 @@ + registerJobUtils(utilMap); + registerMarkupUtils(utilMap); + registerMessageUtils(utilMap); ++ registerSettingsUtils(utilMap); + registerMusicUtils(utilMap); + registerRecordingUtils(utilMap); + +diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro +index f0ecbf5..f9472fc 100644 +--- a/mythtv/programs/mythutil/mythutil.pro ++++ b/mythtv/programs/mythutil/mythutil.pro +@@ -22,8 +22,10 @@ QMAKE_CLEAN += $(TARGET) + HEADERS += backendutils.h fileutils.h jobutils.h markuputils.h + HEADERS += messageutils.h mpegutils.h musicmetautils.h + HEADERS += recordingutils.h ++HEADERS += settingsutils.h + SOURCES += main.cpp mythutil.cpp commandlineparser.cpp + SOURCES += backendutils.cpp fileutils.cpp jobutils.cpp markuputils.cpp + SOURCES += messageutils.cpp mpegutils.cpp musicmetautils.cpp eitutils.cpp + SOURCES += recordingutils.cpp ++SOURCES += settingsutils.cpp + + mingw|win32-msvc*: LIBS += -lwinmm -lws2_32 +diff --git a/mythtv/programs/mythutil/settingsutils.cpp b/mythtv/programs/mythutil/settingsutils.cpp +new file mode 100644 +index 0000000..8fc7b0e +--- /dev/null ++++ b/mythtv/programs/mythutil/settingsutils.cpp +@@ -0,0 +1,586 @@ ++// C++ includes ++#include ++using namespace std; ++ ++//QT includes ++#include ++#include ++#include ++ ++// libmyth* includes ++#include "compat.h" ++#include "exitcodes.h" ++#include "mythlogging.h" ++#include "mythcontext.h" ++ ++ ++#include "settingsutils.h" ++ ++ ++static int SaveSettings(const MythUtilCommandLineParser &cmdline) ++{ ++ QString src_hostname; ++ QString groupname; ++ ++ if (cmdline.toBool("groupname")) ++ groupname = cmdline.toString("groupname"); ++ ++ if (cmdline.toBool("hostname")) ++ src_hostname = cmdline.toString("hostname"); ++ else ++ src_hostname = gCoreContext->GetHostName(); ++ ++ gCoreContext->savesettings_togroup(src_hostname,groupname); ++ return GENERIC_EXIT_OK; ++} ++ ++static int DeleteSettings(const MythUtilCommandLineParser &cmdline) ++{ ++ ++ QString delete_hostname; ++ QString groupname; ++ ++ if (cmdline.toBool("groupname")) ++ groupname = cmdline.toString("groupname"); ++ ++ if (cmdline.toBool("hostname")) ++ delete_hostname = cmdline.toString("hostname"); ++ else ++ delete_hostname = gCoreContext->GetHostName(); ++ ++ ++ gCoreContext->deletesettings(delete_hostname,groupname); ++ ++ return GENERIC_EXIT_OK; ++} ++ ++ ++static int RestoreSettings(const MythUtilCommandLineParser &cmdline) ++{ ++ QString dest_hostname; ++ QString groupname; ++ QString tablestring; ++ QStringList table_list; ++ ++ if (cmdline.toBool("groupname")) ++ groupname = cmdline.toString("groupname"); ++ ++ ++ if (cmdline.toBool("hostname")) ++ dest_hostname = cmdline.toString("hostname"); ++ else ++ dest_hostname = gCoreContext->GetHostName(); ++ ++ if (cmdline.toBool("table_list")) ++ { ++ tablestring = QString(cmdline.toString("table_list")); ++ table_list = tablestring.split(",", QString::SkipEmptyParts); ++ } ++ ++ gCoreContext->restoresettings(dest_hostname, ++ groupname, ++ table_list); ++ ++ return GENERIC_EXIT_OK; ++} ++ ++ ++static int CopySettings(const MythUtilCommandLineParser &cmdline) ++{ ++ QString src_hostname; ++ QString groupname; ++ QString tablestring; ++ QStringList table_list; ++ bool is_full_clone; ++ QString dest_hostname; ++ ++ if (cmdline.toBool("groupname")) ++ groupname = cmdline.toString("groupname"); ++ else ++ groupname = "Current"; ++ ++ if (cmdline.toBool("hostname")) ++ src_hostname = cmdline.toString("hostname"); ++ else ++ src_hostname = gCoreContext->GetHostName(); ++ ++ if (cmdline.toBool("newhost")) ++ dest_hostname = cmdline.toString("newhost"); ++ ++ if (cmdline.toBool("table_list")) ++ { ++ tablestring = QString(cmdline.toString("table_list")); ++ table_list = tablestring.split(",", QString::SkipEmptyParts); ++ } ++ ++ if (cmdline.toBool("fullclone")) ++ is_full_clone = true; ++ else ++ is_full_clone = false; ++ ++ gCoreContext->clonesettings(src_hostname, ++ groupname, ++ table_list, ++ is_full_clone, ++ dest_hostname); ++ ++ return GENERIC_EXIT_OK; ++} ++ ++void print_out_diff_formated(QMap resultset) ++{ ++ QString settings_header; ++ QString keybindings_header; ++ QString tempString; ++ QString tempItem; ++ QString dashline_settings; ++ QString dashline_key; ++ QStringList tempList; ++ ++ QString host_1; ++ QString host_2; ++ QString data_1; ++ QString data_2; ++ QString value; ++ QString context; ++ QString action; ++ ++ int value_width = 35; ++ int data_width = 40; ++ ++ int context_width = 22; ++ int action_width = 22; ++ int key_width = 35; ++ ++ dashline_key = (tempString.fill('-', 133)); ++ dashline_settings = (tempString.fill('-', 130)); ++ ++ QMap::iterator i; ++ ++ ++ for (i = resultset.begin(); i != resultset.end(); ++i) ++ { ++ cout << endl< resultset; ++ QString diff_hostname1; ++ QString diff_hostname2; ++ QStringList table_list; ++ bool format_results = false; ++ QMap::iterator i; ++ ++ if (cmdline.toBool("host_1")) ++ diff_hostname1 = cmdline.toString("host_1"); ++ if (cmdline.toBool("host_2")) ++ diff_hostname2 = cmdline.toString("host_2"); ++ ++ if (cmdline.toBool("table_list")) ++ { ++ QString tablestring = QString(cmdline.toString("table_list")); ++ table_list = tablestring.split(",", QString::SkipEmptyParts); ++ } ++ ++ if (cmdline.toBool("format")) ++ format_results = true; ++ ++ resultset = gCoreContext->diff_settingsgroupname(diff_hostname1, ++ diff_hostname2, ++ table_list); ++ if (resultset.isEmpty()) ++ cout << "No differences found" << endl; ++ else ++ { ++ if (format_results) ++ print_out_diff_formated(resultset); ++ else ++ { ++ for (i = resultset.begin(); i != resultset.end(); ++i) ++ { ++ cout << i.key().toLocal8Bit().constData() << " : \t" << endl;; ++ for (int y = 0; y < i.value().size(); ++y) ++ cout << i.value().at(y).toLocal8Bit().constData()< resultset; ++ resultset = gCoreContext->list_settingsgroupname(); ++ QMap::iterator i; ++ cout << endl; ++ for (i = resultset.begin(); i != resultset.end(); ++i) ++ { ++ cout << i.key().toLocal8Bit().constData() << " : \t"; ++ for (int y = 0; y < i.value().size(); ++y) ++ cout << i.value().at(y).toLocal8Bit().constData()<<" " ; ++ cout << endl; ++ } ++ return GENERIC_EXIT_OK; ++}; ++ ++static int ImportSettings(const MythUtilCommandLineParser &cmdline) ++{ ++ ++ if (cmdline.toString("infile").isEmpty()) ++ { ++ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing --infile option\n"); ++ return GENERIC_EXIT_INVALID_CMDLINE; ++ } ++ QString import_hostname; ++ bool change_name = false; ++ if (cmdline.toBool("hostname")) ++ { ++ change_name = true; ++ import_hostname = cmdline.toString("hostname"); ++ } ++ QString import_filename = cmdline.toString("infile"); ++ QFile myFile(import_filename); ++ ++ QDomDocument doc( "exported_xml" ); ++ doc.setContent( &myFile ); ++ ++ QDomElement docElement = doc.documentElement(); ++ QDomElement record_element; ++ ++ if ( docElement.nodeName() != "exported_xml" ) ++ { ++ cout << "not a valid exported xml file" << endl; ++ return 1; ++ } ++ ++ QString out_string = "Importing records, please be patient"; ++ cout << out_string.toLocal8Bit().constData() << endl; ++ //Gives list of records in the file + count ++ QDomNodeList nodeList = docElement.childNodes(); ++ int total_records = nodeList.count(); ++ out_string = QString("\nFound %1 records \n").arg(total_records); ++ cout << out_string.toLocal8Bit().constData() << endl; ++ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, out_string); ++ ++ for(QDomNode n = docElement.firstChild(); !n.isNull(); n = n.nextSibling()) ++ { ++ QString table_name=QString(); ++ QMap value_pair_map ; ++ ++ //find table name for this record ++ QDomNode tablenode=n.namedItem("table"); ++ record_element = tablenode.toElement(); ++ table_name = record_element.text(); ++ ++ //loop over childern of n and convert to element ++ for(QDomNode subn = n.firstChild(); ++ !subn.isNull(); ++ subn = subn.nextSibling()) ++ { ++ record_element = subn.toElement(); ++ if ( record_element.nodeName() == "table" ) ++ continue; ++ if ( change_name && record_element.nodeName() == "hostname" ) ++ value_pair_map[record_element.nodeName()] = import_hostname; ++ else ++ value_pair_map[record_element.nodeName()] = record_element.text(); ++ } ++ if (import_filename.endsWith("syssettings.xml")) ++ { ++ if ( value_pair_map["value"] == "BackendServerIP") ++ { ++ out_string = "sysettings, ignoring backendserver ip record"; ++ cout << out_string.toLocal8Bit().constData() << endl; ++ } ++ else ++ gCoreContext->import_settings(value_pair_map,table_name); ++ } ++ else ++ //perform insert ++ gCoreContext->import_settings(value_pair_map,table_name); ++ } ++ return GENERIC_EXIT_OK; ++}; //end ImportSettings ++ ++ ++static int ExportSettings(const MythUtilCommandLineParser &cmdline) ++{ ++ QMap > records; ++ QString src_hostname; ++ QString groupname; ++ QStringList table_list; ++ QString tablestring; ++ bool distro_default = false; ++ bool generic = false; ++ bool skip_host = false; ++ ++ ++ ++ QDomDocument doc("mythutils_exported_settings"); ++ ++ if (cmdline.toBool("groupname")) ++ groupname = cmdline.toString("groupname"); ++ else ++ groupname = "current"; ++ ++ if (cmdline.toBool("hostname")) ++ src_hostname = cmdline.toString("hostname"); ++ else ++ src_hostname = gCoreContext->GetHostName(); ++ ++ if (cmdline.toBool("distro-default")) ++ { ++ distro_default = true; ++ skip_host = true; ++ } ++ if (cmdline.toBool("generic")) ++ { ++ generic = true; ++ //skip_host = true; ++ } ++ if (cmdline.toBool("table_list")) ++ { ++ tablestring = QString(cmdline.toString("table_list")); ++ table_list = tablestring.split(",", QString::SkipEmptyParts); ++ } ++ else ++ table_list << "settings" <<"keybindings" <<"jumppoints" ; ++ ++ if (cmdline.toString("outfile").isEmpty()) ++ { ++ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing --outfile option\n"); ++ return GENERIC_EXIT_INVALID_CMDLINE; ++ } ++ ++ QString export_filename = cmdline.toString("outfile"); ++ ++ records = gCoreContext->export_settings(src_hostname,groupname, ++ table_list, skip_host); ++ ++ QDomElement exported_xml = doc.createElement("exported_xml"); ++ doc.appendChild(exported_xml); ++ ++ QMap record_count; ++ QMap >::iterator i; ++ for (i = records.begin(); i != records.end(); ++i ) ++ { ++ QDomElement record = doc.createElement("record"); ++ exported_xml.appendChild(record); ++ ++ //loop over all values in the record ++ QMap value_pair = i.value(); ++ QMap::iterator y; ++ //because we don't know the name of the key, we loop over it ++ for (y = value_pair.begin(); y != value_pair.end(); ++y) ++ { ++ //add key/pair to xml document ++ QDomElement tag = doc.createElement(y.key()); ++ record.appendChild(tag); ++ QDomText t; ++ if ( distro_default == true ) ++ { // If exporting distro_default then change hostname + table ++ if ( y.key() == "hostname" ) ++ { //check for global values here, empty value means global ++ if ( y.value().isEmpty() ) ++ t = doc.createTextNode(y.value()); ++ else ++ t = doc.createTextNode("distro_default"); ++ } ++ else if ( y.key() == "table") ++ t = doc.createTextNode(y.value()+"_distro_default"); ++ else ++ t = doc.createTextNode(y.value()); ++ } ++ ++ else if ( generic == true ) ++ { // If exporting generic then change hostname ++ if ( y.key() == "hostname" ) ++ { //check for global values here, empty value means global ++ if ( y.value().isEmpty() ) ++ t = doc.createTextNode(y.value()); ++ else ++ t = doc.createTextNode("REPLACE_ME"); ++ } ++ else ++ t = doc.createTextNode(y.value()); ++ } ++ else ++ t = doc.createTextNode(y.value()); ++ ++ tag.appendChild(t); ++ //create record counts ++ if ( y.key() == "table" ) ++ { ++ if ( record_count.contains( y.value()) ) ++ { ++ int record_num = record_count[y.value()]; ++ record_count[y.value()] = ++record_num; ++ } ++ else ++ record_count[y.value()] = 1; ++ } ++ } ++ } ++ QFile file( export_filename ); ++ ++ if( !file.open(QIODevice::WriteOnly) ) ++ return -1; ++ ++ QTextStream ts( &file ); ++ ts << doc.toString(); ++ file.close(); ++ QMap::iterator rc_it; ++ for ( rc_it = record_count.begin(); rc_it != record_count.end(); ++rc_it) ++ { ++ QString table = rc_it.key(); ++ int rc_count = rc_it.value(); ++ QString out_string = QString ("Exported table %1: %2 records") ++ .arg(table) ++ .arg(rc_count); ++ cout << out_string.toLocal8Bit().constData() << endl; ++ } ++ return GENERIC_EXIT_OK; ++}; // end export_settings ++ ++ ++static int ChangeHostname(const MythUtilCommandLineParser &cmdline) ++{ ++ ++ QString old_hostname; ++ QString new_hostname; ++ ++ ++ if (cmdline.toBool("oldhost")) ++ old_hostname = cmdline.toString("oldhost"); ++ ++ if (cmdline.toBool("newhost")) ++ new_hostname = cmdline.toString("newhost"); ++ ++ if (old_hostname.isEmpty()) ++ { ++ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing or empty --old-host option\n"); ++ return GENERIC_EXIT_INVALID_CMDLINE; ++ } ++ ++ if (new_hostname.isEmpty()) ++ { ++ LOG(VB_STDIO|VB_FLUSH, LOG_ERR, "Missing or empty --new-host option\n"); ++ return GENERIC_EXIT_INVALID_CMDLINE; ++ } ++ ++ gCoreContext->change_hostname(old_hostname, new_hostname); ++ ++ return GENERIC_EXIT_OK; ++}; //end ChangeHostname ++ ++void registerSettingsUtils(UtilMap &utilMap) ++{ ++ utilMap["savesettings"] = &SaveSettings; ++ utilMap["deletesettings"] = &DeleteSettings; ++ utilMap["restoresettings"] = &RestoreSettings; ++ utilMap["copysettings"] = &CopySettings; ++ utilMap["diffsettings"] = &DiffSettings; ++ utilMap["listgroups"] = &ListGroups; ++ utilMap["importsettings"] = &ImportSettings; ++ utilMap["exportsettings"] = &ExportSettings; ++ utilMap["changehostname"] = &ChangeHostname; ++} ++ ++/* vim: set expandtab tabstop=4 shiftwidth=4: */ +\ No newline at end of file +diff --git a/mythtv/programs/mythutil/settingsutils.h b/mythtv/programs/mythutil/settingsutils.h +new file mode 100644 +index 0000000..413496c +--- /dev/null ++++ b/mythtv/programs/mythutil/settingsutils.h +@@ -0,0 +1,3 @@ ++#include "mythutil.h" ++ ++void registerSettingsUtils(UtilMap &utilMap); diff --git a/abs/core/mythtv/stable-0.28/mythtv/mythtv.install b/abs/core/mythtv/stable-0.28/mythtv/mythtv.install new file mode 100644 index 0000000..4ca5ebc --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/mythtv.install @@ -0,0 +1,25 @@ +# arg 1: the new package version +post_install() { + gen_is_xml.py + gen_lib_xml.py + systemconfig.py -m config_xml +} + +pre_upgrade() { + /bin/true +} + +post_upgrade() { + post_install +} + + +# arg 1: the old package version +post_remove() { + /bin/true + +} + +op=$1 +shift +$op $* diff --git a/abs/core/mythtv/stable-0.28/mythtv/recordings b/abs/core/mythtv/stable-0.28/mythtv/recordings new file mode 100644 index 0000000..984fea9 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/recordings @@ -0,0 +1,112 @@ +#!/bin/bash + +#START=$(date +%s) + +#check if mythbackend is running and was just started +for i in 1 2 +do +if [ `cat /service/mythbackend/supervise/pid` ] +then + now=$(date +%s) + mythbackendStartTime=`stat -c %Y /service/mythbackend/supervise/pid` + if [[ $(( $now - $mythbackendStartTime )) -lt 59 ]] + then + #echo "mythbackend started less than a minute ago. Sleeping..." + sleep 60 + fi +else + #echo "mythbackend not running. exiting." + exit +fi +done + +if [ -f /usr/share/mythtv/contrib/user_jobs/mythlink.pl ] +then + recdir="/data/storage/disk0/media/recordings" + tmprecdir="/data/storage/disk0/media/tmp/recordings" + rm -r $tmprecdir + su - mythtv -c "perl /usr/share/mythtv/contrib/user_jobs/mythlink.pl --format '%U/%T/%T %- S%ssE%ep %- %oY-%om-%od = %S' --link '$tmprecdir'" + + #delete Deleted recgroup and move files out of other dirs + if [ -d "$tmprecdir/Deleted" ] + then + rm -r "$tmprecdir/Deleted" + fi + #move all links in recgroup dirs out to tmprecdir + for recgroup in $tmprecdir/* + do + if [ -d "$recgroup" ] + then + rsync -a "$recgroup/" "$tmprecdir" + rm -r "$recgroup" + fi + done + #replace SE if no season/episode is in myth + for link in $tmprecdir/**/*\ -\ SE\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE - / - /'` + mv "$link" "$newlink" + done + #replace SEyy if no season is in myth + for link in $tmprecdir/**/*\ -\ SE[0-9][0-9]\ -\ * + do + newlink=`echo "$link" | sed 's/ - SE/ - S00E/'` + mv "$link" "$newlink" + done + #replace SyyE if no episode is in myth + for link in $tmprecdir/**/*\ -\ S[0-9][0-9]E\ -\ * + do + newlink=`echo "$link" | sed 's/E - /E00 - /'` + mv "$link" "$newlink" + done + #replace blank original date + for link in $tmprecdir/**/*\ -\ 0000-00-00\ -\ * + do + newlink=`echo "$link" | sed 's/ - 0000-00-00 - / - /'` + mv "$link" "$newlink" + done + #add dash pt suffix if filename before the subtitle is the same + #so that plex will scan and include in library + uniqs="$(ls $tmprecdir/**/* | sed 's/ = .*//' | sort | uniq -d)" + SAVEIFS=$IFS + IFS=$'\n' + for link in $uniqs + do + i=1 + for dup in `ls -v $link*` + do + newlink=`echo "$dup" | sed "s/ = /-pt$i = /"` + mv "$dup" "$newlink" + i=$((i+1)) + done + done + IFS=$SAVEIFS + + #change symlinks mtime to match the file it is linked to +# for link in $tmprecdir/**/* +# do +# if [ -L "$link" ] +# then +# file=`readlink "$link"` +# touch -hr "$file" "$link" +# fi +# done + + #sync tmprecdir to recdir + #rsync -aOP --delete --ignore-existing "$tmprecdir/" "$recdir/" + rsync -aO --delete "$tmprecdir/" "$recdir/" + + #check if plex media server is running + if [[ `pidof "Plex Media Server"` ]] + then + #get plex section and update + /usr/LH/bin/plexmediascanner.sh -l | grep -i myth | cut -d: -f1 | while read -r line + do + /usr/LH/bin/plexmediascanner.sh --scan --refresh --section $line + done + fi +fi + +#END=$(date +%s) +#DIFF=$(( $END - $START )) +#echo "It took $DIFF seconds" diff --git a/abs/core/mythtv/stable-0.28/mythtv/suggestedstarttime.patch.v1 b/abs/core/mythtv/stable-0.28/mythtv/suggestedstarttime.patch.v1 new file mode 100644 index 0000000..26d4c36 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/suggestedstarttime.patch.v1 @@ -0,0 +1,32 @@ +diff --git a/mythtv/programs/mythbackend/httpstatus.cpp b/mythtv/programs/mythbackend/httpstatus.cpp +index 8571a58..be0272f 100644 +--- a/mythtv/programs/mythbackend/httpstatus.cpp ++++ b/mythtv/programs/mythbackend/httpstatus.cpp +@@ -1392,13 +1392,17 @@ int HttpStatus::PrintMachineInfo( QTextStream &os, QDomElement info ) + QString sStatus = e.attribute( "status" , "" ); + QDateTime next = MythDate::fromString( e.attribute( "next" , "" )); + QString sNext = next.isNull() ? "" : +- MythDate::toString(next, MythDate::kDatabase); ++ MythDate::toString(next, MythDate::kDateTimeFull); + QString sMsg = ""; + + QDateTime thru = MythDate::fromString( e.attribute( "guideThru", "" )); + + QDomText text = e.firstChild().toText(); + ++ QString mfdblrs = ++ gCoreContext->GetSetting("mythfilldatabaseLastRunStart"); ++ QDateTime lastrunstart = MythDate::fromString(mfdblrs); ++ + if (!text.isNull()) + sMsg = text.nodeValue(); + +@@ -1412,7 +1416,7 @@ int HttpStatus::PrintMachineInfo( QTextStream &os, QDomElement info ) + + os << sStatus << "
\r\n"; + +- if (!next.isNull() && sNext >= sStart) ++ if (!next.isNull() && next >= lastrunstart) + { + os << " Suggested next mythfilldatabase run: " + << sNext << ".
\r\n"; diff --git a/abs/core/mythtv/stable-0.28/mythtv/videoAlwaysUseBookmark.patch b/abs/core/mythtv/stable-0.28/mythtv/videoAlwaysUseBookmark.patch new file mode 100644 index 0000000..7a0b428 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythtv/videoAlwaysUseBookmark.patch @@ -0,0 +1,22 @@ +--- src/mythtv/programs/mythfrontend/main.cpp.orig 2014-10-05 21:16:54.226667223 +0000 ++++ src/mythtv/programs/mythfrontend/main.cpp 2014-10-06 20:31:16.822482368 +0000 +@@ -1166,14 +1166,11 @@ + + if (useBookmark && bookmarkPresent) + { +- MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack(); +- BookmarkDialog *bookmarkdialog = new BookmarkDialog(pginfo, mainStack); +- if (!bookmarkdialog->Create()) +- { +- delete bookmarkdialog; +- delete pginfo; +- return res; +- } ++ TV::StartTV(pginfo, kStartTVNoFlags); ++ ++ res = 0; ++ ++ delete pginfo; + } + else + { diff --git a/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD new file mode 100644 index 0000000..33b2837 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythweb/PKGBUILD @@ -0,0 +1,58 @@ +pkgname=mythweb +pkgver=0.28 +pkgrel=1 +commit_hash=`cat ../git_src/git_hash_web` +pkgdesc="Web interface for MythTV's backend, $commit_hash" +arch=('i686' 'x86_64') +url="http://www.mythtv.org" +license=('GPL') +depends=('lighttpd' "mythtv>=${pkgver}" 'php' 'supplemental-web') +groups=('mythtv-extras') +install=mythweb.install + +patches=() +source=(`echo ${patches[@]:0}` + 'mythweb.include' + 'mythweb_gen_light.conf') + +build() { + if [ -e ${srcdir}/mythweb ] + then + msg "Removing old mythweb src" + rm -rf ${srcdir}/mythweb + fi + + cd ${startdir} + msg "Copying in mythweb git_src" + cp -rp ../git_src/mythweb $srcdir + cd ${srcdir}/$pkgname + + msg "--------------------------applying patches------------------------------" + for i in `echo ${patches[@]:0} ` + do + echo applying $i + echo "-----------------------------" + patch -Np0 -i ${srcdir}/$i || return 1 + done + msg "--------------------------done applying patches-------------------------" + + [ "$CARCH" = "i686" ] && ARCH="i686" + [ "$CARCH" = "x86_64" ] && ARCH="x86-64" +} + +package() { + DOCROOT=/data/srv/httpd/mythweb + mkdir -p $pkgdir/$DOCROOT/{image_cache,php_sessions,data} + rsync -arp --exclude .git* --delete-excluded $srcdir/mythweb/* $pkgdir/$DOCROOT + rm $pkgdir/$DOCROOT/README + chown -R http:http $pkgdir/$DOCROOT + chmod -R 775 $pkgdir/$DOCROOT/{image_cache,php_sessions,data} + + #install conf files for lighttpd + mkdir -p $pkgdir/etc/lighttpd + install -D -m 644 $srcdir/mythweb.include $pkgdir/etc/lighttpd/ + #gen_light_conf + install -D -m0744 ${srcdir}/mythweb_gen_light.conf ${pkgdir}/etc/gen_light_conf.d/mythweb.conf +} +md5sums=('7645a6399434cbba35639713ac5d88e0' + 'df190116b3aba35720fb6631885f973f') diff --git a/abs/core/mythtv/stable-0.28/mythweb/mythweb.include b/abs/core/mythtv/stable-0.28/mythweb/mythweb.include new file mode 100644 index 0000000..18e9be1 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythweb/mythweb.include @@ -0,0 +1,8 @@ +alias.url += ( "/mythweb" => "/data/srv/httpd/mythweb/") + +url.rewrite-once = ( +"^/{1,2}mythweb/(css|data|images|js|themes|skins|[a-z_]+\.(php|pl)).*" => "$0", +"^/{1,2}mythweb/(pl(/.*)?)$" => "/mythweb/mythweb.pl/$1", +"^/{1,2}mythweb/(.+)$" => "/mythweb/mythweb.php/$1", +"^/{1,2}mythweb/(.*)$" => "/mythweb/mythweb.php" +) \ No newline at end of file diff --git a/abs/core/mythtv/stable-0.28/mythweb/mythweb.install b/abs/core/mythtv/stable-0.28/mythweb/mythweb.install new file mode 100644 index 0000000..b8e31a8 --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythweb/mythweb.install @@ -0,0 +1,22 @@ +post_install() { + echo "==> Setting mythweb permissions." + chmod -R 755 /data/srv/httpd/mythweb/ + chown mythtv:http /data/srv/httpd/mythweb/data/tv_icons + chmod -R 775 /data/srv/httpd/mythweb/{image_cache,php_sessions,data} + echo "==> Reading lighttpd's configuration file." + gen_light_include.py + echo "==> Restarting lighttpd." + /sbin/sv hup /service/lighttpd +} + +post_upgrade() { + post_install +} + +post_remove() { + gen_light_include.py + echo + echo "==> Forcing a re-read of lighttpd's configuration file." + echo "" + /sbin/sv hup /service/lighttpd +} diff --git a/abs/core/mythtv/stable-0.28/mythweb/mythweb_gen_light.conf b/abs/core/mythtv/stable-0.28/mythweb/mythweb_gen_light.conf new file mode 100644 index 0000000..ddf0d2f --- /dev/null +++ b/abs/core/mythtv/stable-0.28/mythweb/mythweb_gen_light.conf @@ -0,0 +1 @@ +include "/etc/lighttpd/mythweb.include" -- cgit v0.12