diff --git a/FrontendInfo-dreamos.tar.gz b/FrontendInfo-dreamos.tar.gz new file mode 100644 index 0000000..8d5c6e6 Binary files /dev/null and b/FrontendInfo-dreamos.tar.gz differ diff --git a/installer.sh b/installer.sh index 647481c..6b3aecb 100644 --- a/installer.sh +++ b/installer.sh @@ -65,6 +65,7 @@ echo "" [ -d $PLUGINPICONTMPPATH ] && rm -rf $PLUGINPICONTMPPATH > /dev/null 2>&1 [ -r /tmp/RaedQuickSignal-"$version".tar.gz ] && rm -f /tmp/RaedQuickSignal-"$version".tar.gz > /dev/null 2>&1 [ -r /tmp/RaedQuickServName2-dreamos.tar.gz ] && rm -f /tmp/RaedQuickServName2-dreamos.tar.gz > /dev/null 2>&1 +[ -r /tmp/FrontendInfo-dreamos.tar.gz ] && rm -f /tmp/FrontendInfo-dreamos.tar.gz > /dev/null 2>&1 ### backup Current files/Folders and save it beffore delete old version of plugin mkdir -p $BACKUPPATH [ -r $PLUGINPATH/tools/keymap.xml ] && cp -f $PLUGINPATH/tools/keymap.xml $BACKUPPATH/keymap.xml > /dev/null 2>&1 @@ -82,32 +83,37 @@ cd /tmp set -e rm -rf *RaedQuickSignal* > /dev/null 2>&1 if [ -f /var/lib/dpkg/status ]; then - echo "# Your image is OE2.5/2.6 #" - echo "" - echo "" - #cd /tmp - #wget https://github.com/fairbird/RaedQuickSignal/archive/refs/heads/main.tar.gz - #tar -xzf main.tar.gz - #cp -r 'RaedQuickSignal-main/usr' '/' - #cp -r 'RaedQuickSignal-main/tmp/RaedQuickSignal' '/tmp' - #wget https://github.com/fairbird/RaedQuickSignal/raw/main/RaedQuickServName2-dreamos.tar.gz - #if [ -f '/tmp/RaedQuickServName2-dreamos.tar.gz' ]; then - # rm -f /usr/lib/enigma2/python/Components/Converter/RaedQuickServName2.py > /dev/null 2>&1 - #fi - #tar -xzf RaedQuickServName2-dreamos.tar.gz -C / + echo "# Your image is OE2.5/2.6 #" + echo "" + echo "" + #cd /tmp + #wget https://github.com/fairbird/RaedQuickSignal/archive/refs/heads/main.tar.gz + #tar -xzf main.tar.gz + #cp -r 'RaedQuickSignal-main/usr' '/' + #cp -r 'RaedQuickSignal-main/tmp/RaedQuickSignal' '/tmp' + #wget https://github.com/fairbird/RaedQuickSignal/raw/main/RaedQuickServName2-dreamos.tar.gz + #if [ -f '/tmp/RaedQuickServName2-dreamos.tar.gz' ]; then + # rm -f /usr/lib/enigma2/python/Components/Converter/RaedQuickServName2.py > /dev/null 2>&1 + #fi + #tar -xzf RaedQuickServName2-dreamos.tar.gz -C / else - echo "# Your image is OE2.0 #" - echo "" - echo "" - #wget https://github.com/fairbird/RaedQuickSignal/archive/refs/heads/main.tar.gz - #tar -xzf main.tar.gz - #cp -r 'RaedQuickSignal-main/usr' '/' - #cp -r 'RaedQuickSignal-main/tmp/RaedQuickSignal' '/tmp' + echo "# Your image is OE2.0 #" + echo "" + echo "" + #wget https://github.com/fairbird/RaedQuickSignal/archive/refs/heads/main.tar.gz + #tar -xzf main.tar.gz + #cp -r 'RaedQuickSignal-main/usr' '/' + #cp -r 'RaedQuickSignal-main/tmp/RaedQuickSignal' '/tmp' fi wget https://github.com/fairbird/RaedQuickSignal/archive/refs/heads/main.tar.gz tar -xzf main.tar.gz cp -r 'RaedQuickSignal-main/usr' '/' cp -r 'RaedQuickSignal-main/tmp/RaedQuickSignal' '/tmp' +if [ -f /var/lib/dpkg/status ]; then + cd /tmp + wget https://github.com/fairbird/RaedQuickSignal/raw/refs/heads/dreamos/FrontendInfo-dreamos.tar.gz + tar -xzf FrontendInfo-dreamos.tar.gz -C / +fi set +e cd .. sleep 2 @@ -163,6 +169,7 @@ rm -rf $PLUGINPICONTMPPATH > /dev/null 2>&1 rm -rf $BACKUPPATH > /dev/null 2>&1 rm -f /tmp/RaedQuickSignal-"$version".tar.gz > /dev/null 2>&1 rm -f /tmp/RaedQuickServName2-dreamos.tar.gz > /dev/null 2>&1 +rm -f /tmp/FrontendInfo-dreamos.tar.gz > /dev/null 2>&1 sync echo "" echo "" diff --git a/usr/lib/enigma2/python/Components/Converter/RaedQuickFrontendInfo2.py b/usr/lib/enigma2/python/Components/Converter/RaedQuickFrontendInfo2.py index 516629d..81111b3 100644 --- a/usr/lib/enigma2/python/Components/Converter/RaedQuickFrontendInfo2.py +++ b/usr/lib/enigma2/python/Components/Converter/RaedQuickFrontendInfo2.py @@ -1,7 +1,7 @@ #!/usr/bin/python # -*- coding: utf-8 -*- # by 2boom 2011-14 -# last update 18.01.2014 +# last update 25.07.2026 by RAED from Components.Converter.Converter import Converter from Components.Element import cached @@ -50,14 +50,14 @@ def getAGC(self): snr = self.source.snr if not snr: return agc - snr_percent = snr * 100.0 / 65535.0 + snr_percent = float(snr) * 100.0 / 65535.0 if snr_percent < 35: agc_percent = snr_percent * 1.8 elif snr_percent < 70: agc_percent = 63 + ((snr_percent - 35) * 0.8) else: agc_percent = 91 + ((snr_percent - 70) * 0.3) - return round(min(100, agc_percent) * self.range / 100.0) + return int(round(min(100, agc_percent) * float(self.range) / 100.0)) @cached def getText(self):