Mercurial > traipse_dev
changeset 32:c223c1051f4a traipse_dev
Update Manager moves into Beta 0.3 with a nice new look. The skeleton is
designed, not the functionality will be added.
| author | sirebral |
|---|---|
| date | Sun, 02 Aug 2009 16:43:55 -0500 |
| parents | 3769c8d6431e |
| children | 3687514e0218 |
| files | orpg/orpg_version.py orpg/tools/updater.py start_tester.py |
| diffstat | 3 files changed, 6 insertions(+), 302 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/orpg_version.py Sun Aug 02 01:00:33 2009 -0500 +++ b/orpg/orpg_version.py Sun Aug 02 16:43:55 2009 -0500 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Dev" DIS_VER = "Grumpy Goblin" -BUILD = "090802-02" +BUILD = "090802-03" # This version is for network capability. PROTOCOL_VERSION = "1.2"
--- a/orpg/tools/updater.py Sun Aug 02 01:00:33 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,298 +0,0 @@ -import wx -#import wx.html -#import webbrowser -#import urllib -#import zipfile -#import traceback -import hashlib -import orpg.dirpath -from orpg.orpgCore import * -import orpg.orpg_version -import orpg.tools.orpg_log -import orpg.orpg_xml -import orpg.dirpath -import orpg.tools.orpg_settings -import orpg.tools.validate -from mercurial import ui, hg, commands, repo, revlog, cmdutil -dir_struct = open_rpg.get_component("dir_struct") - - - -# -------------------- -# | | | -# | Change | Download | -# | Log | List | -# | |-----------| -# | | butons | -# ---------------------- -# Buttons area includes, []Auto Update, <advanced> -# - - -class ChangeLog(wx.Panel): - def __init__( self, parent, id): - wx.Panel.__init__( self, parent, id, size=(400, -1)) - - -class updaterFrame(wx.Frame): - def __init__(self, parent, title, openrpg): - - ### Update Manager - self.ui = ui.ui() - self.repo = hg.repository(self.ui, ".") - self.c = self.repo.changectx('tip') - - self.openrpg = openrpg - self.parent = parent - self.log = self.openrpg.get_component("log") - self.log.log("Enter updaterFrame", ORPG_DEBUG) - - wx.Frame.__init__(self, None, wx.ID_ANY, title, size=(640,480), - style=wx.FRAME_NO_TASKBAR | wx.STAY_ON_TOP | wx.DEFAULT_FRAME_STYLE) - self.SetBackgroundColour(wx.WHITE) - self.CenterOnScreen() - self.settings = openrpg.get_component('settings') - self.xml = openrpg.get_component('xml') - self.dir_struct = self.openrpg.get_component("dir_struct") - self.sizer = wx.GridBagSizer(hgap=1, vgap=1) - self.changelog = wx.TextCtrl(self, wx.ID_ANY, size=(400, -1), style=wx.TE_MULTILINE | wx.TE_READONLY) - - self.filelist = wx.TextCtrl(self, wx.ID_ANY, size=(250, 300), style=wx.TE_MULTILINE | wx.TE_READONLY) - self.buttons = {} - self.buttons['progress_bar'] = wx.Gauge(self, wx.ID_ANY, 100) - self.buttons['auto_text'] = wx.StaticText(self, wx.ID_ANY, "Auto Update") - self.buttons['auto_check'] = wx.CheckBox(self, wx.ID_ANY) - - self.buttons['no_text'] = wx.StaticText(self, wx.ID_ANY, "No Update") - self.buttons['no_check'] = wx.CheckBox(self, wx.ID_ANY) - - self.buttons['advanced'] = wx.Button(self, wx.ID_ANY, "Package Select") - self.buttons['update'] = wx.Button(self, wx.ID_ANY, "Update Now") - self.buttons['finish'] = wx.Button(self, wx.ID_ANY, "Finish") - - self.sizer.Add(self.changelog, (0,0), span=(3,1), flag=wx.EXPAND) - self.sizer.Add(self.filelist, (0,1), span=(1,3), flag=wx.EXPAND) - - self.sizer.Add(self.buttons['progress_bar'], (1,1), span=(1,3), flag=wx.EXPAND) - - self.sizer.Add(self.buttons['auto_text'], (2,1)) - self.sizer.Add(self.buttons['auto_check'], (2,2), flag=wx.EXPAND) - - self.sizer.Add(self.buttons['no_text'], (3,1)) - self.sizer.Add(self.buttons['no_check'], (3,2), flag=wx.EXPAND) - - self.sizer.Add(self.buttons['advanced'], (2,3), flag=wx.EXPAND) - self.sizer.Add(self.buttons['update'], (3,3), flag=wx.EXPAND) - self.sizer.Add(self.buttons['finish'], (4,3), span=(1,2), flag=wx.EXPAND) - self.sizer.AddGrowableCol(0) - self.sizer.AddGrowableRow(0) - self.SetSizer(self.sizer) - self.SetAutoLayout(True) - self.initPrefs() - - if self.package == None: wx.CallAfter(self.Advanced) - #if self.autoupdate == "On": self.buttons['auto_check'].SetValue(True) - - ## Event Handlers - self.Bind(wx.EVT_BUTTON, self.Update, self.buttons['update']) - self.Bind(wx.EVT_BUTTON, self.Finish, self.buttons['finish']) - #self.Bind(wx.EVT_BUTTON, self.Advanced, self.buttons['advanced']) - #self.Bind(wx.EVT_CHECKBOX, self.ToggleAutoUpdate, self.buttons['auto_check']) - - - def showFinish(self): - if self.Updated: self.filelist.SetValue(self.filelist.GetValue() + "Finished ... \n") - self.buttons['finish'].Show() - self.buttons['advanced'].Show() - - def initPrefs(self): - #self.list_url = self.settings.get_setting("PackagesURL") - #self.package_type = self.settings.get_setting("PackagesType") - #self.package_name = self.settings.get_setting("PackagesName") - self.SelectPackage = False - #self.autoupdate = self.settings.get_setting("AutoUpdate") - self.packages = None - self.package = self.get_package() - self.Updated = False - self.Finished = False - - def isFinished(self): - return self.Finished - - def ToggleAutoUpdate(self, event): - if self.buttons['auto_check'].GetValue(): - self.autoupdate = "On" - #self.settings.set_setting("AutoUpdate", "On") - #self.Update(None) - else: - self.autoupdate = "Off" - #self.settings.set_setting("AutoUpdate", "Off") - - - def Update(self, evt=None): - - hg.clean(self.repo, self.current) - - def Finish(self, evt=None): - #self.settings.updateIni() - self.Finished = True - self.Destroy() - - def Advanced(self, evt=None): - dlg = wx.Dialog(self, wx.ID_ANY, "Package Selector", style=wx.DEFAULT_DIALOG_STYLE) - if wx.Platform == '__WXMSW__': icon = wx.Icon(self.dir_struct["icon"]+'d20.ico', wx.BITMAP_TYPE_ICO) - else: icon = wx.Icon(self.dir_struct["icon"]+"d20.xpm", wx.BITMAP_TYPE_XPM ) - dlg.SetIcon(icon) - - dlgsizer = wx.GridBagSizer(hgap=1, vgap=1) - Yes = wx.Button( dlg, wx.ID_OK, "Ok" ) - Yes.SetDefault() - rgroup = wx.RadioButton(dlg, wx.ID_ANY, "group_start", style=wx.RB_GROUP) - rgroup.Hide() - - if self.packages == None: self.get_packages() - if self.package_list == None: return - - - types = self.package_list - row=0; col=0 - self.current = self.c.branch() - self.package_type = self.current - self.btnlist = {}; self.btn = {} - self.id = 1 - - self.PackageSet(None) - - for t in types: - self.btnName = str(t) - self.btn[self.id] = wx.RadioButton(dlg, wx.ID_ANY, str(t), name=self.btnName) - if self.btnName == self.current: - self.btn[self.id].SetValue(True) - self.btnlist[self.id] = self.btnName - dlgsizer.Add(self.btn[self.id], (row, col)) - row += 1; self.id += 1 - - dlgsizer.Add(Yes, (row+1,0)) - dlg.SetAutoLayout( True ) - dlg.SetSizer( dlgsizer ) - dlgsizer.Fit( dlg ) - dlg.Centre() - - dlg.Bind(wx.EVT_RADIOBUTTON, self.PackageSet) - - if dlg.ShowModal(): - dlg.Destroy() - if self.Updated: - self.Updated = False - self.filelist.SetValue('') - wx.CallAfter(self.check) - - def PackageSet(self, event): - for btn in self.btn: - if self.btn[btn].GetValue() == True: self.current = self.btnlist[btn] - - branches = self.repo.branchtags() - - heads = dict.fromkeys(self.repo.heads(), 1) - l = [((n in heads), self.repo.changelog.rev(n), n, t) for t, n in branches.items()] - - #l.sort() - #l.reverse() - #for ishead, r, n, t in l: self.package_list.append(t) - - if self.current != type: - u = ui.ui() - r = hg.repository(u, ".") - #r = hg.islocal() - c = r.changectx('tip') - files = self.c.files() - #print commands.log(u, r, c) - #print r.changelog - - ### Cleaning up for dev build 0.1 - ### The below material is for the Rev Log. You can run hg log to see what data it will pull. - #cs = r.changectx(c.rev()).changeset() - #get = util.cachefunc(lambda r: repo.changectx(r).changeset()) - #changeiter, matchfn = cmdutil.walkchangerevs(u, r, 1, cs, 1) - #for st, rev, fns in changeiter: - # revbranch = get(rev)[5]['branch']; print revbranch - - heads = dict.fromkeys(self.repo.heads(), self.repo.branchtags()) - branches = dict.copy(self.repo.branchtags()) - - self.filelist.SetValue('') - self.filelist.AppendText("Files that will change\n\n") - - self.changelog.SetValue('') - changelog = "This is Dev Build 0.1 of the Update Manager. It has limited functionality.\n\nThe full release will search your Revision log and show the contents here." - self.changelog.AppendText(changelog + '\n') - self.filelist.AppendText("Update to " + self.current + "\n\n The full release will show the files to be changed here.") - - #### Files works but not fully without the change log information, pulled for Dev 0.1 - #for f in files: - # fc = c[f] - # self.filelist.AppendText(str(f + '\n')) - - def verify_file(self, abs_path): - """Returns True if file or directory exists""" - try: - os.stat(abs_path) - return True - except OSError: - self.log.log("Invalid File or Directory: " + abs_path, ORPG_GENERAL) - return False - - def get_packages(self, type=None): - #Fixed and ready for Test. Can be cleaner - self.package_list = [] - b = self.repo.branchtags() - heads = dict.fromkeys(self.repo.heads(), 1) - l = [((n in heads), self.repo.changelog.rev(n), n, t) for t, n in b.items()] - l.sort() - l.reverse() - for ishead, r, n, t in l: self.package_list.append(t) - - def get_package(self): - #Fixed and ready for test. - if self.packages == None: self.get_packages() - if self.package_list == None: return None - return None - -class updateApp(wx.App): - def OnInit(self): - self.open_rpg = open_rpg - self.log = orpg.tools.orpg_log.orpgLog(orpg.dirpath.dir_struct["user"] + "runlogs/") - self.log.setLogToConsol(False) - self.log.log("Updater Start", ORPG_NOTE) - - #Add the initial global components of the openrpg class - #Every class should be passed openrpg - self.open_rpg.add_component("log", self.log) - self.open_rpg.add_component("xml", orpg.orpg_xml) - self.open_rpg.add_component("dir_struct", orpg.dirpath.dir_struct) - self.validate = orpg.tools.validate.Validate() - self.open_rpg.add_component("validate", self.validate) - #self.settings = orpg.tools.orpg_settings.orpgSettings(self.open_rpg) - #self.open_rpg.add_component("settings", self.settings) - #self.settings.updateIni() - self.updater = updaterFrame(self, "OpenRPG Update Manager Beta 0.2", self.open_rpg) - self.updated = False - try: - self.updater.Show() - self.SetTopWindow(self.updater) - self.updater.Fit() - except: pass - - return True - - def OnExit(self): - #self.settings.save() - """ - imported = ['orpg.orpgCore', 'orpg.orpg_wx', 'orpg.orpg_version', 'orpg.tools.orpg_log', 'orpg.orpg_xml', 'orpg.dirpath', 'orpg.tools.orpg_settings', 'orpg.tools.validate', 'orpg.pulldom', 'orpg.tools.NotebookCtrl', 'orpg.tools.config_update', 'orpg.systempath', 'orpg.minidom', 'orpg.dirpath.dirpath_tools', 'orpg.tools.rgbhex', 'orpg.orpg_windows'] - - for name in imported: - if name in sys.modules: - self.log.log("Unimported " + name, ORPG_DEBUG) - del sys.modules[name] - """ - self.log.log("Updater Exit\n\n", ORPG_NOTE)
--- a/start_tester.py Sun Aug 02 01:00:33 2009 -0500 +++ b/start_tester.py Sun Aug 02 16:43:55 2009 -0500 @@ -18,10 +18,12 @@ del sys.modules[key] from orpg.orpg_wx import * + +import upmana.updatemana +app = upmana.updatemana.updateApp(0) +app.MainLoop() + import orpg.main -import orpg.tools.updater -app = orpg.tools.updater.updateApp(0) -app.MainLoop() if WXLOADED: