Merge pull request #866 from awiouy/wgp

webgrabplus: add system.d timer
This commit is contained in:
Christian Hewitt 2016-10-23 16:33:57 +04:00 committed by GitHub
commit 349b0fff3a
8 changed files with 148 additions and 56 deletions

View File

@ -1,14 +1,19 @@
8.0.103
104
- Upgrade siteini.pack to 20161021
- Add system.d timer
- Add license headers
103
- Upgrade mdb ini files
8.0.102
102
- Upgrade WebGrab+Plus to 56.29.pre
- Upgrade siteini.pack to 20160807
- Call user defined pre/post processing
8.0.101
101
- Upgrade WebGrab+Plus to 56.28.pre
- Upgrade siteini.pack to 20160729
8.0.100
100
- Initial addon

View File

@ -1,6 +1,24 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
PKG_NAME="webgrabplus"
PKG_VERSION="56.29pre-20160807-mdb"
PKG_REV="103"
PKG_VERSION="56.29pre-20161021"
PKG_REV="104"
PKG_ARCH="any"
PKG_LICENSE="prop."
PKG_SITE="http://www.webgrabplus.com/"

View File

@ -0,0 +1,71 @@
#!/bin/sh
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /etc/profile
oe_setup_addon service.webgrabplus
wgp_user () {
echo "User defined $1"
if [ -f "$2" ]
then
echo "Calling user defined $1 script $2"
sh "$2"
else
echo "Nothing to do"
fi
}
mkdir -p "$ADDON_HOME"
cd "$ADDON_HOME"
for p in chans2correct.xml mdb rex siteini.pack WebGrab++.config.xml
do
if [ ! -e "$p" ]
then
cp -r "$ADDON_DIR/config/$p" .
fi
done
sid="$(basename $(find $ADDON_DIR/config/siteini.pack -name SiteIni.Pack_*.txt))"
sih="$(basename $(find siteini.pack -name SiteIni.Pack_*.txt))"
if [ "$sid" \> "$sih" ]
then
rm -rf siteini.pack
cp -r "$ADDON_DIR/config/siteini.pack" .
fi
wgp_user "pre-processing" "$ADDON_HOME/before.sh"
mono $ADDON_DIR/WebGrab+Plus/WebGrab+Plus.exe
if [ -f guide_mdb.xml ]
then
cp guide_mdb.xml guide_wgp.xml
rm guide_mdb.xml
fi
cp guide_wgp.xml guide_xtc.xml
mono $ADDON_DIR/WebGrab+Plus/xmltv_time_correct.exe guide_wgp.xml guide_xtc.xml < /dev/zero
cp guide_xtc.xml guide.xml
rm guide_xtc.xml
mono $ADDON_DIR/WebGrab+Plus/WG2MP.exe guide.xml mediaportal.xml
wgp_user "post-processing" "$ADDON_HOME/after.sh"

View File

@ -1,54 +1,25 @@
#!/bin/sh
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
. /etc/profile
oe_setup_addon service.webgrabplus
wgp_user () {
echo "User defined $1"
if [ -f "$2" ]
then
echo "Calling user defined $1 script $2"
sh "$2"
else
echo "Nothing to do"
fi
}
[ "$wgp_on_act" ] && on_act="--on-active=$wgp_on_act"
mkdir -p "$ADDON_HOME"
cd "$ADDON_HOME"
for p in chans2correct.xml mdb rex siteini.pack WebGrab++.config.xml
do
if [ ! -e "$p" ]
then
cp -r "$ADDON_DIR/config/$p" .
fi
done
sid="$(basename $(find $ADDON_DIR/config/siteini.pack -name SiteIni.Pack_*.txt))"
sih="$(basename $(find siteini.pack -name SiteIni.Pack_*.txt))"
if [ "$sid" \> "$sih" ]
then
rm -rf siteini.pack
cp -r "$ADDON_DIR/config/siteini.pack" .
fi
wgp_user "pre-processing" "$ADDON_HOME/before.sh"
mono $ADDON_DIR/WebGrab+Plus/WebGrab+Plus.exe
if [ -f guide_mdb.xml ]
then
cp guide_mdb.xml guide_wgp.xml
rm guide_mdb.xml
fi
cp guide_wgp.xml guide_xtc.xml
mono $ADDON_DIR/WebGrab+Plus/xmltv_time_correct.exe guide_wgp.xml guide_xtc.xml < /dev/zero
cp guide_xtc.xml guide.xml
rm guide_xtc.xml
mono $ADDON_DIR/WebGrab+Plus/WG2MP.exe guide.xml mediaportal.xml
wgp_user "post-processing" "$ADDON_HOME/after.sh"
systemd-run $on_act --on-calendar="$wgp_on_cal" --unit=webgrabplus /bin/sh $ADDON_DIR/bin/webgrabplus.run

View File

@ -0,0 +1,14 @@
msgid ""
msgstr ""
msgctxt "#30000"
msgid "systemd-run"
msgstr ""
msgctxt "#30001"
msgid "--on-active"
msgstr ""
msgctxt "#30002"
msgid "--on-calendar"
msgstr ""

View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<settings>
<category label="30000">
<setting label="30001" id="wgp_on_act" type="number" default="300" />
<setting label="30002" id="wgp_on_cal" type="text" default="*-*-* 03:00:00" />
</category>
</settings>

View File

@ -0,0 +1,4 @@
<settings>
<setting id="wgp_on_act" value="300" />
<setting id="wgp_on_cal" value="*-*-* 03:00:00" />
</settings>

View File

@ -6,8 +6,10 @@ Requires=network.target
[Service]
ExecStart=/bin/sh /storage/.kodi/addons/service.webgrabplus/bin/webgrabplus.start
Restart=always
RestartSec=21600
ExecStop=/usr/bin/systemctl stop webgrabplus.timer
ExecStop=/usr/bin/systemctl stop webgrabplus.service
RemainAfterExit=yes
Type=oneshot
[Install]
WantedBy=kodi.target