0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[wesnoth_addon_manager] try to connect only once...

Browse source 
...to the server when --html is used in parallel to
--download/--list/--update
This commit is contained in:
Elias Pschernig 2009-10-10 10:12:54 +00:00
parent 1739459cd8
commit 9607325744
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
data/tools/wesnoth_addon_manager
View file

@ -178,9 +178,11 @@ if __name__ == "__main__":
version = info.get_or_create_sub("info").get_text_val("version", "")
return uploads, version
campaign_list = None
if options.list:
cs = CampaignClient(address)
data = cs.list_campaigns()
campaign_list = data = cs.list_campaigns()
if data:
campaigns = data.get_or_create_sub("campaigns")
if options.wml:
@ -220,7 +222,7 @@ if __name__ == "__main__":
elif options.download:
cs = CampaignClient(address)
fetchlist = []
data = cs.list_campaigns()
campaign_list = data = cs.list_campaigns()
if data:
campaigns = data.get_or_create_sub("campaigns")
for campaign in campaigns.get_all("campaign"):
@ -337,7 +339,7 @@ if __name__ == "__main__":
dirs = glob.glob(os.path.join(cdir, "*"))
dirs = [x for x in dirs if os.path.isdir(x)]
cs = CampaignClient(address)
data = cs.list_campaigns()
campaign_list = data = cs.list_campaigns()
if not data:
sys.stderr.write("Could not connect to the add-on server.\n")
sys.exit(-1)
@ -385,13 +387,14 @@ if __name__ == "__main__":
else:
optionparser.print_help()
# This is independent, so a single call to the script can also do the
# HTML output.
if options.html:
cs = CampaignClient(address)
data = cs.list_campaigns()
if data:
if not campaign_list:
cs = CampaignClient(address)
campaign_list = cs.list_campaigns()
if campaign_list:
import addon_manager.html
addon_manager.html.output(options.html, options.url, data)
addon_manager.html.output(options.html, options.url,
campaign_list)
else:
sys.stderr.write("Could not connect.\n")
sys.stderr.write("Could not retrieve campaign list " +
"for HTML output.\n")