This is an automated email from the git hooks/post-receive script. smcv pushed a commit to branch master in repository game-data-packager.
commit 491f0a507c53e5c8ed40040af32617132f499459 Author: Simon McVittie <s...@debian.org> Date: Wed Dec 27 17:43:27 2017 +0000 make_template: Start using the GameData to dump out fields Signed-off-by: Simon McVittie <s...@debian.org> --- game_data_packager/make_template.py | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/game_data_packager/make_template.py b/game_data_packager/make_template.py index 30500a0..3051522 100644 --- a/game_data_packager/make_template.py +++ b/game_data_packager/make_template.py @@ -141,8 +141,6 @@ def is_runtime(path): class Template: def __init__(self, game): self.game = game - self.longname = None - self.try_repack_from = [] self.plugin = None self.gog = dict() @@ -299,7 +297,7 @@ class Template: def add_one_dir(self, destdir, lower=False, game=None, lang=None): if destdir.startswith('/usr/local') or destdir.startswith('/opt/'): - self.try_repack_from.append(destdir) + self.game.try_repack_from.append(destdir) if not game: game = os.path.basename(os.path.abspath(destdir)) @@ -314,7 +312,7 @@ class Template: for acf in parse_acf(destdir[:steam+11]): if '/common/' + acf['installdir'] in destdir: steam_id = acf['appid'] - self.longname = game = acf['name'] + self.game.longname = game = acf['name'] break steam_dict['id'] = int(steam_id) steam_dict['path'] = destdir[steam+11:] @@ -418,7 +416,7 @@ class Template: stderr=subprocess.DEVNULL, universal_newlines=True, cwd=tmp) - self.longname = log.split('\n')[0].split('"')[1] + self.game.longname = log.split('\n')[0].split('"')[1] self.add_one_dir(os.path.join(tmp, 'app'), game=game, lang=guess_lang(exe), lower=lower) rm_rf(tmp) @@ -573,20 +571,11 @@ class Template: def print_yaml(self): print('---') - yaml.dump(self.game.to_data(expand=False), - default_flow_style=False, - stream=sys.stdout) + data = self.game.to_data(expand=False) + + if data: + yaml.dump(data, default_flow_style=False, stream=sys.stdout) - if self.longname: - print('longname: %s' % self.longname) - print('copyright: © 1970 FIXME') - if self.try_repack_from: - if len(self.try_repack_from) == 1: - print('try_repack_from: %s' % self.try_repack_from) - else: - print('try_repack_from:') - for path in sorted(self.try_repack_from): - print('- "%s"' % path) if self.plugin: print('plugin: %s' % self.plugin) @@ -755,7 +744,11 @@ def main(): do_flacsums(args.args[0],args.lower) return - game = GameData('__template__', dict(packages={})) + game = GameData('__template__', + dict( + copyright='© 1970 FIXME', + packages={}, + )) template = Template(game) # "./run make-template setup_<game>.exe gog_<game>.deb" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits