From 7b6d2eb379b4409a602d40837fc938f78d8b54c9 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 16:30:09 +0100 Subject: dont install default favourite list when no DVB-S(2) is available --- data/defaults/Dream/dm500hd.info | 14 ++++++++++++-- data/defaults/Dream/dm7020hd.info | 14 ++++++++++++-- data/defaults/Dream/dm7025.info | 14 ++++++++++++-- data/defaults/Dream/dm800.info | 14 ++++++++++++-- data/defaults/Dream/dm8000.info | 14 ++++++++++++-- data/defaults/Dream/dm800se.info | 14 ++++++++++++-- 6 files changed, 72 insertions(+), 12 deletions(-) diff --git a/data/defaults/Dream/dm500hd.info b/data/defaults/Dream/dm500hd.info index b1b4d53d..a81398d3 100644 --- a/data/defaults/Dream/dm500hd.info +++ b/data/defaults/Dream/dm500hd.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info index 3af46795..41c8eb6f 100644 --- a/data/defaults/Dream/dm7020hd.info +++ b/data/defaults/Dream/dm7020hd.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info index a1585cfe..a7ec38c4 100644 --- a/data/defaults/Dream/dm7025.info +++ b/data/defaults/Dream/dm7025.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info index 4793bd85..214c6d10 100644 --- a/data/defaults/Dream/dm800.info +++ b/data/defaults/Dream/dm800.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info index 2ef2013a..97b34def 100644 --- a/data/defaults/Dream/dm8000.info +++ b/data/defaults/Dream/dm8000.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info index 6974b120..0259563f 100644 --- a/data/defaults/Dream/dm800se.info +++ b/data/defaults/Dream/dm800se.info @@ -19,8 +19,18 @@ - - + + + + + + + + + + + + -- cgit v1.2.3 From 95e2b1d28f81fbeb01e558286806887c556d7a98 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 18:50:23 +0100 Subject: config.py: update configEntrys on additional loadFromFile refs bug #617 --- lib/python/Components/config.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) 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) -- cgit v1.2.3 From 447f15a477f3f7b8016074750ea245a3d76174a5 Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 18:55:33 +0100 Subject: fix record blink widget pos and size refs #618 --- data/skin_default.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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())) Format:%S - + config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean Blink @@ -1221,7 +1221,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) Format:%H:%M - + config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean Blink @@ -1253,7 +1253,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y())) Format:%H:%M - + config.usage.blinking_display_clock_during_recording,True,CheckSourceBoolean Blink -- cgit v1.2.3 From 6f4128414821db6028c9d17efdf5dde5156f749b Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 18:56:11 +0100 Subject: show all services list on first start, when the favourite list is empty (DVB-C/DVB-T) refs #617 --- data/defaults/Dream/Makefile.am | 4 +++- data/defaults/Dream/dm500hd.info | 10 ++++++++++ data/defaults/Dream/dm7020hd.info | 10 ++++++++++ data/defaults/Dream/dm7025.info | 10 ++++++++++ data/defaults/Dream/dm800.info | 10 ++++++++++ data/defaults/Dream/dm8000.info | 10 ++++++++++ data/defaults/Dream/dm800se.info | 10 ++++++++++ data/defaults/Dream/settings.c | 1 + data/defaults/Dream/settings.t | 1 + 9 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 data/defaults/Dream/settings.c create mode 100644 data/defaults/Dream/settings.t 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 a81398d3..9743c1f1 100644 --- a/data/defaults/Dream/dm500hd.info +++ b/data/defaults/Dream/dm500hd.info @@ -31,6 +31,16 @@ + + + + + + + + + + diff --git a/data/defaults/Dream/dm7020hd.info b/data/defaults/Dream/dm7020hd.info index 41c8eb6f..c0b89452 100644 --- a/data/defaults/Dream/dm7020hd.info +++ b/data/defaults/Dream/dm7020hd.info @@ -31,6 +31,16 @@ + + + + + + + + + + diff --git a/data/defaults/Dream/dm7025.info b/data/defaults/Dream/dm7025.info index a7ec38c4..9201aa17 100644 --- a/data/defaults/Dream/dm7025.info +++ b/data/defaults/Dream/dm7025.info @@ -31,6 +31,16 @@ + + + + + + + + + + diff --git a/data/defaults/Dream/dm800.info b/data/defaults/Dream/dm800.info index 214c6d10..b91f7a74 100644 --- a/data/defaults/Dream/dm800.info +++ b/data/defaults/Dream/dm800.info @@ -31,6 +31,16 @@ + + + + + + + + + + diff --git a/data/defaults/Dream/dm8000.info b/data/defaults/Dream/dm8000.info index 97b34def..ff60dd57 100644 --- a/data/defaults/Dream/dm8000.info +++ b/data/defaults/Dream/dm8000.info @@ -31,6 +31,16 @@ + + + + + + + + + + diff --git a/data/defaults/Dream/dm800se.info b/data/defaults/Dream/dm800se.info index 0259563f..2e11cdcb 100644 --- a/data/defaults/Dream/dm800se.info +++ b/data/defaults/Dream/dm800se.info @@ -31,6 +31,16 @@ + + + + + + + + + + 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; -- cgit v1.2.3 From b3573fbdc64db68dc1b375f399b07d1296776b4d Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 19:15:43 +0100 Subject: defaultsatlists.xml: ask to scan when no default servicelists are avail refs #619 --- data/defaultsatlists.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 - + + if self.runWizard: self.condition = True -- cgit v1.2.3 From 53c44df02c114d2160fc35c304d278ca3e54e7bd Mon Sep 17 00:00:00 2001 From: ghost Date: Mon, 15 Nov 2010 21:06:49 +0100 Subject: Components/Harddisc.py: fix handling for old devfs 7025 kernel i.e. this fixes broken free space displaying in aboutbox refs bug#598 --- lib/python/Components/Harddisk.py | 47 +++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) mode change 100755 => 100644 lib/python/Components/Harddisk.py diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py old mode 100755 new mode 100644 index e8e612a4..7f837565 --- 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) -- cgit v1.2.3