- def __init__(self, _id, _title, _url, _parent):
+ def __init__(self, _id, _title, _url, _parent, _type):
- print "%s-> %d, %s, %s, %d" % (_intent, self.mId, self.mTitle, self.mUrl, self.mParent)
+ print "%s-> %d, %s, %s, %d, %d" % (_intent, self.mId, self.mTitle, self.mUrl, self.mParent, self.mType)
self.mConfig.read(self.mFileName)
self.mCategoryCurrentIdx = self.getNumber('__SYS__', 'category_current_idx')
self.mConfig.read(self.mFileName)
self.mCategoryCurrentIdx = self.getNumber('__SYS__', 'category_current_idx')
self.mPopulateValid = False
def _del(self, _section, _option=None):
self.mPopulateValid = False
def _del(self, _section, _option=None):
- def __new__(cls, *args, **kwargs):
- if not cls._instance:
- cls._instance = super(Singleton, cls).__new__(
- cls, *args, **kwargs)
- return cls._instance
+ def __new__(cls, *args, **kwargs):
+ if not cls._instance:
+ cls._instance = super(Singleton, cls).__new__(cls, *args, **kwargs)
+ return cls._instance
def __init__(self, _dbFileName):
SimpleConfigParser.__init__(self)
def __init__(self, _dbFileName):
SimpleConfigParser.__init__(self)
os.system('echo "[__SYS__]" > %s'%(_dbFileName))
os.system('echo "category_current_idx = 1" >> %s'%(_dbFileName))
os.system('echo "[__SYS__]" > %s'%(_dbFileName))
os.system('echo "category_current_idx = 1" >> %s'%(_dbFileName))
os.system('echo "[c-1]" >> %s'%(_dbFileName))
os.system('echo "id = 1" >> %s'%(_dbFileName))
os.system('echo "name = My favorite" >> %s'%(_dbFileName))
os.system('echo "[b-1]" >> %s'%(_dbFileName))
os.system('echo "[c-1]" >> %s'%(_dbFileName))
os.system('echo "id = 1" >> %s'%(_dbFileName))
os.system('echo "name = My favorite" >> %s'%(_dbFileName))
os.system('echo "[b-1]" >> %s'%(_dbFileName))
os.system('echo "id = 1" >> %s'%(_dbFileName))
os.system('echo "parent = 1" >> %s'%(_dbFileName))
os.system('echo "title = Vuplus Home" >> %s'%(_dbFileName))
os.system('echo "id = 1" >> %s'%(_dbFileName))
os.system('echo "parent = 1" >> %s'%(_dbFileName))
os.system('echo "title = Vuplus Home" >> %s'%(_dbFileName))
+ os.system('echo "type = 0" >> %s'%(_dbFileName))
+ if manualmode :
+ os.system('echo "[b-2]" >> %s'%(_dbFileName))
+ os.system('echo "url = file:///usr/local/manual/main.html" >> %s'%(_dbFileName))
+ os.system('echo "id = 2" >> %s'%(_dbFileName))
+ os.system('echo "parent = 1" >> %s'%(_dbFileName))
+ os.system('echo "title = User Manual" >> %s'%(_dbFileName))
+ os.system('echo "type = 1" >> %s'%(_dbFileName))
self.init(_dbFileName)
def message(self, format, params=None):
if not self.mDebugEnable:
return
if params is None:
self.init(_dbFileName)
def message(self, format, params=None):
if not self.mDebugEnable:
return
if params is None:
- def addBookmark(self, _title, _url, _parent):
+ def addBookmark(self, _title, _url, _parent, _type):
- self.message("add bookmark : %s, %s, %d", (_title, _url, _parent,))
+ self.message("add bookmark : %s, %s, %d, %d", (_title, _url, _parent, _type,))
self.mConfig.add_section(s)
self.setNumber(s, 'id', i)
self.setString(s, 'title', _title)
self.setString(s, 'url', _url)
self.setNumber(s, 'parent', _parent)
self.mConfig.add_section(s)
self.setNumber(s, 'id', i)
self.setString(s, 'title', _title)
self.setString(s, 'url', _url)
self.setNumber(s, 'parent', _parent)
def updateBookmark(self, _bookmark):
self.populate()
s = "b-%d" % (_bookmark.mId)
def updateBookmark(self, _bookmark):
self.populate()
s = "b-%d" % (_bookmark.mId)
- self.message("update bookmark : %s, %s, %d", (_bookmark.mTitle, _bookmark.mUrl, _bookmark.mParent,))
+ self.message("update bookmark : %s, %s, %d, %d", (_bookmark.mTitle, _bookmark.mUrl, _bookmark.mParent, _bookmark.mType,))
self.setString(s, 'title', _bookmark.mTitle)
self.setString(s, 'url', _bookmark.mUrl)
self.setNumber(s, 'parent', _bookmark.mParent)
self.setString(s, 'title', _bookmark.mTitle)
self.setString(s, 'url', _bookmark.mUrl)
self.setNumber(s, 'parent', _bookmark.mParent)
t = self.getString(s, 'title')
u = self.getString(s, 'url')
p = self.getNumber(s, 'parent')
t = self.getString(s, 'title')
u = self.getString(s, 'url')
p = self.getNumber(s, 'parent')
- categoryList[p].appendBookmark(BookmarkData(i, t, u, p))
+ categoryList[p].appendBookmark(BookmarkData(i, t, u, p, e))
except Exception, e: self._del(s)
bx += 1
for key in categoryList.iterkeys():
except Exception, e: self._del(s)
bx += 1
for key in categoryList.iterkeys():