Merge branch 'bug_271_ac3pcm_delay_servicemp3'

[enigma2.git] / lib / python / Components / About.py

diff --git a/lib/python/Components/About.py b/lib/python/Components/About.py
index 2aa3f50c67058640cfb2efa98ab2fc1bb0b99f73..8e332e3381c85b8b5d565fc33caa92230e404e45 100644 (file)
--- a/lib/python/Components/About.py
+++ b/lib/python/Components/About.py
@@ -1,10 +1,14 @@
 from Tools.Directories import resolveFilename, SCOPE_SYSETC
+from enigma import getEnigmaVersionString
 
 class About:
        def __init__(self):
                pass
-       
+
        def getVersionString(self):
+               return self.getImageVersionString()
+
+       def getImageVersionString(self):
                try:
                        file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
                        lines = file.readlines()
@@ -15,15 +19,28 @@ class About:
                                        #0120 2005 11 29 01 16
                                        #0123 4567 89 01 23 45
                                        version = splitted[1]
+                                       image_type = version[0] # 0 = release, 1 = experimental
+                                       major = version[1]
+                                       minor = version[2]
+                                       revision = version[3]
                                        year = version[4:8]
                                        month = version[8:10]
                                        day = version[10:12]
-                                       
-                                       return '-'.join(["dev", year, month, day])
+                                       date = '-'.join((year, month, day))
+                                       if image_type == '0':
+                                               image_type = "Release"
+                                               version = '.'.join((major, minor, revision))
+                                               return ' '.join((image_type, version, date))
+                                       else:
+                                               image_type = "Experimental"
+                                               return ' '.join((image_type, date))
                        file.close()
                except IOError:
                        pass
 
                return "unavailable"
-       
+
+       def getEnigmaVersionString(self):
+               return getEnigmaVersionString()
+
 about = About()