aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/defaults/Dream/Makefile.am4
-rw-r--r--data/defaults/Dream/dm500hd.info24
-rw-r--r--data/defaults/Dream/dm7020hd.info24
-rw-r--r--data/defaults/Dream/dm7025.info24
-rw-r--r--data/defaults/Dream/dm800.info24
-rw-r--r--data/defaults/Dream/dm8000.info24
-rw-r--r--data/defaults/Dream/dm800se.info24
-rw-r--r--data/defaults/Dream/settings.c1
-rw-r--r--data/defaults/Dream/settings.t1
-rw-r--r--data/defaultsatlists.xml3
-rwxr-xr-xdata/skin_default.xml6
-rw-r--r--[-rwxr-xr-x]lib/python/Components/Harddisk.py47
-rwxr-xr-xlib/python/Components/config.py17
13 files changed, 187 insertions, 36 deletions
diff --git a/data/defaults/Dream/Makefile.am b/data/defaults/Dream/Makefile.am
index 1758f67d..ee66c93a 100644
--- a/data/defaults/Dream/Makefile.am
+++ b/data/defaults/Dream/Makefile.am
@@ -15,4 +15,6 @@ dist_install_DATA = \
settings.7020hd \
settings.7025 \
settings.800 \
- settings.8000
+ settings.8000 \
+ settings.c \
+ settings.t
diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info
index b1b4d53d..9743c1f1 100644
--- a/data/defaults/Dream/dm500hd.info
+++ b/data/defaults/Dream/dm500hd.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info
index 3af46795..c0b89452 100644
--- a/data/defaults/Dream/dm7020hd.info
+++ b/data/defaults/Dream/dm7020hd.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info
index a1585cfe..9201aa17 100644
--- a/data/defaults/Dream/dm7025.info
+++ b/data/defaults/Dream/dm7025.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="sdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info
index 4793bd85..b91f7a74 100644
--- a/data/defaults/Dream/dm800.info
+++ b/data/defaults/Dream/dm800.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info
index 2ef2013a..ff60dd57 100644
--- a/data/defaults/Dream/dm8000.info
+++ b/data/defaults/Dream/dm8000.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info
index 6974b120..2e11cdcb 100644
--- a/data/defaults/Dream/dm800se.info
+++ b/data/defaults/Dream/dm800se.info
@@ -19,8 +19,28 @@
<satellite type="192" />
</prerequisites>
</file-->
- <file type="favourites" directory="" name="bouquets.tv" />
- <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv" />
+ <file type="favourites" directory="" name="bouquets.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="favourites" directory="hdbouquets/" name="userbouquet.favourites.tv">
+ <prerequisites>
+ <bcastsystem type="DVB-S" />
+ <satellite type="192" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.c">
+ <prerequisites>
+ <bcastsystem type="DVB-C" />
+ </prerequisites>
+ </file>
+ <file type="config" name="settings.t">
+ <prerequisites>
+ <bcastsystem type="DVB-T" />
+ </prerequisites>
+ </file>
<!--file type="package" directory="packages/" name="small-test_1.0_mipsel.ipk" /-->
</files>
</default>
diff --git a/data/defaults/Dream/settings.c b/data/defaults/Dream/settings.c
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.c
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaults/Dream/settings.t b/data/defaults/Dream/settings.t
new file mode 100644
index 00000000..72ab9382
--- /dev/null
+++ b/data/defaults/Dream/settings.t
@@ -0,0 +1 @@
+config.tv.lastroot=1:7:1:0:0:0:0:0:0:0:(type == 1) || (type == 17) || (type == 22) || (type == 25) || (type == 134) || (type == 195) ORDER BY name;
diff --git a/data/defaultsatlists.xml b/data/defaultsatlists.xml
index 132b427c..f8bee5fe 100644
--- a/data/defaultsatlists.xml
+++ b/data/defaultsatlists.xml
@@ -16,7 +16,8 @@ self.disableKeys = True
<text value="There are no default services lists in your image." />
</step>
- <step id="nothingtoinstall" nextstep="finisheddefaultsatlists">
+ <!--step id="nothingtoinstall" nextstep="finisheddefaultsatlists"-->
+ <step id="nothingtoinstall" nextstep="scanquestion">
<condition>
if self.runWizard:
self.condition = True
diff --git a/data/skin_default.xml b/data/skin_default.xml
index 272fdcf9..dcd2e8bb 100755
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -1205,7 +1205,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="100,34" zPosition="1" size="26,30" font="Regular;16" valign="top">
<convert type="ClockToText">Format:%S</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="6,30" zPosition="1" size="120,34">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="6,32" zPosition="1" size="126,32">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>
@@ -1221,7 +1221,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
<convert type="ClockToText">Format:%H:%M</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>
@@ -1253,7 +1253,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
<widget source="global.CurrentTime" render="Label" position="0,38" size="96,26" font="Regular;32" halign="center" valign="center" foregroundColor="#FFFFFF" backgroundColor="#000000" >
<convert type="ClockToText">Format:%H:%M</convert>
</widget>
- <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,30">
+ <widget source="session.RecordState" render="FixedLabel" text=" " position="0,38" zPosition="1" size="96,26">
<convert type="ConfigEntryTest">config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean</convert>
<convert type="ConditionalShowHide">Blink</convert>
</widget>
diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py
index e8e612a4..7f837565 100755..100644
--- a/lib/python/Components/Harddisk.py
+++ b/lib/python/Components/Harddisk.py
@@ -5,6 +5,10 @@ from SystemInfo import SystemInfo
import time
from Components.Console import Console
+def MajorMinor(path):
+ rdev = stat(path).st_rdev
+ return (major(rdev),minor(rdev))
+
def readFile(filename):
file = open(filename)
data = file.read().strip()
@@ -125,13 +129,15 @@ class Harddisk:
for line in lines:
parts = line.strip().split(" ")
- if path.realpath(parts[0]).startswith(self.dev_path):
- try:
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
stat = statvfs(parts[1])
- except OSError:
- continue
- return stat.f_bfree/1000 * stat.f_bsize/1000
-
+ return stat.f_bfree/1000 * stat.f_bsize/1000
+ except OSError:
+ pass
return -1
def numPartitions(self):
@@ -168,10 +174,17 @@ class Harddisk:
cmd = "umount"
- for line in lines:
- parts = line.strip().split(" ")
- if path.realpath(parts[0]).startswith(self.dev_path):
- cmd = ' ' . join([cmd, parts[1]])
+ for line in lines:
+ parts = line.strip().split(" ")
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
+ cmd = ' ' . join([cmd, parts[1]])
+ break
+ except OSError:
+ pass
res = system(cmd)
return (res >> 8)
@@ -201,10 +214,16 @@ class Harddisk:
res = -1
for line in lines:
parts = line.strip().split(" ")
- if path.realpath(parts[0]) == self.partitionPath("1"):
- cmd = "mount -t ext3 " + parts[0]
- res = system(cmd)
- break
+ real_path = path.realpath(parts[0])
+ if not real_path[-1].isdigit():
+ continue
+ try:
+ if MajorMinor(real_path) == MajorMinor(self.partitionPath(real_path[-1])):
+ cmd = "mount -t ext3 " + parts[0]
+ res = system(cmd)
+ break
+ except OSError:
+ pass
return (res >> 8)
diff --git a/lib/python/Components/config.py b/lib/python/Components/config.py
index d7506e31..44ad6d2a 100755
--- a/lib/python/Components/config.py
+++ b/lib/python/Components/config.py
@@ -1624,16 +1624,17 @@ class Config(ConfigSubsection):
self.pickle_this("config", self.saved_value, result)
return ''.join(result)
- def unpickle(self, lines):
+ def unpickle(self, lines, base_file=True):
tree = { }
for l in lines:
if not l or l[0] == '#':
continue
n = l.find('=')
+ name = l[:n]
val = l[n+1:].strip()
- names = l[:n].split('.')
+ names = name.split('.')
# if val.find(' ') != -1:
# val = val[:val.find(' ')]
@@ -1644,6 +1645,12 @@ class Config(ConfigSubsection):
base[names[-1]] = val
+ if not base_file: # not the initial config file..
+ #update config.x.y.value when exist
+ configEntry = eval(name)
+ if configEntry is not None:
+ configEntry.value = val
+
# we inherit from ConfigSubsection, so ...
#object.__setattr__(self, "saved_value", tree["config"])
if "config" in tree:
@@ -1655,9 +1662,9 @@ class Config(ConfigSubsection):
f.write(text)
f.close()
- def loadFromFile(self, filename):
+ def loadFromFile(self, filename, base_file=False):
f = open(filename, "r")
- self.unpickle(f.readlines())
+ self.unpickle(f.readlines(), base_file)
f.close()
config = Config()
@@ -1668,7 +1675,7 @@ class ConfigFile:
def load(self):
try:
- config.loadFromFile(self.CONFIG_FILE)
+ config.loadFromFile(self.CONFIG_FILE, True)
except IOError, e:
print "unable to load config (%s), assuming defaults..." % str(e)
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-19 00:09:10 +0000