Fixed Commit errors

This commit is contained in:
Dustin Pianalto 2018-05-09 14:17:15 -08:00
parent 42f5f6baf3
commit a36f23e6ae
2 changed files with 14 additions and 10 deletions

View File

@ -122,3 +122,4 @@ def generate_files(storage_dir, ctx, filename, game_ini, dinos_data, mods):
os.mkdir(directory)
generate_game_ini(game_ini, mods, directory)
generate_dino_files(dinos_data, directory)
return 1

View File

@ -49,17 +49,20 @@ class Uploader:
game_ini, dinos_data, mods)
await msg.edit(content='Processing... Files generated... Committing changes')
await utils.git_add(self.bot.loop, storage_dir, '*')
await utils.git_commit(self.bot.loop,
storage_dir,
f'Uploaded {len(dinos_data)} dinos {official}')
await msg.edit(content='Processing... Committed... Pushing files to GitHub')
push_status = await utils.git_push(self.bot.loop, storage_dir)
if push_status == 'Completed':
await msg.edit(content=f'{ctx.author.mention} Upload complete.')
if await utils.git_commit(self.bot.loop,
storage_dir,
f'"Uploaded {len(dinos_data)} dinos {official}"'):
await msg.edit(content='Processing... Committed... Pushing files to GitHub')
push_status = await utils.git_push(self.bot.loop, storage_dir)
if push_status == 'Completed':
await msg.edit(content=f'{ctx.author.mention} Upload complete.')
else:
await self.bot.get_user(owner_id).send(f'There was an error with git push'
f'\n{push_status}')
await msg.edit(content='There was an error pushing the files to GitHub\n'
'Dusty.P has been notified and will get this fixed')
else:
await self.bot.get_user(owner_id).send(f'There was an error with git push'
f'\n{push_status}')
await msg.edit(content='There was an error pushing the files to GitHub\n'
await msg.edit(content='There was an error committing the files\n'
'Dusty.P has been notified and will get this fixed')
else:
await self.bot.get_user(owner_id).send(f'There was an error with git pull\n'