Merge branch 'master' into dvd_scale_test

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

diff --git a/lib/python/Components/About.py b/lib/python/Components/About.py
index 24bfb2b0c211e43c7dcac9e17d04be6a67f696fd..ce1328cf279888332dd7cd3c1931b726c6df6586 100644 (file)
--- a/lib/python/Components/About.py
+++ b/lib/python/Components/About.py
@@ -1,17 +1,36 @@
-from Tools.Directories import *
+from Tools.Directories import resolveFilename, SCOPE_SYSETC
+from enigma import getEnigmaVersionString
 
 class About:
        def __init__(self):
                pass
-       
+
        def getVersionString(self):
-               file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
-               lines = file.readlines()
-               for x in lines:
-                       splitted = x.split('=')
-                       if splitted[0] == "version":
-                               return "2.0-" + str(splitted[1])
-               file.close()
-               return "2.0b"
-       
-about = About()
\ No newline at end of file
+               return self.getImageVersionString()
+
+       def getImageVersionString(self):
+               try:
+                       file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
+                       lines = file.readlines()
+                       for x in lines:
+                               splitted = x.split('=')
+                               if splitted[0] == "version":
+                                       #     YYYY MM DD hh mm
+                                       #0120 2005 11 29 01 16
+                                       #0123 4567 89 01 23 45
+                                       version = splitted[1]
+                                       year = version[4:8]
+                                       month = version[8:10]
+                                       day = version[10:12]
+
+                                       return '-'.join(["dev", year, month, day])
+                       file.close()
+               except IOError:
+                       pass
+
+               return "unavailable"
+
+       def getEnigmaVersionString(self):
+               return getEnigmaVersionString()
+
+about = About()