From c01450d1a192c24b8048ce6a7d92d0ad3a1babbe Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 11 Mar 2014 23:17:10 +0400 Subject: [PATCH] Expand path for database conversion script --- eos/utils/scripts/jsonToSql.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eos/utils/scripts/jsonToSql.py b/eos/utils/scripts/jsonToSql.py index 17a22633d..bc4136405 100755 --- a/eos/utils/scripts/jsonToSql.py +++ b/eos/utils/scripts/jsonToSql.py @@ -35,6 +35,8 @@ if __name__ == "__main__": parser.add_argument("-j", "--json", required=True, type=str, help="The path to the json dum") args = parser.parse_args() + jsonPath = os.path.expanduser(args.json) + # Import eos.config first and change it import eos.config eos.config.gamedata_connectionstring = args.db @@ -67,7 +69,7 @@ if __name__ == "__main__": # Dump all data to memory so we can easely cross check ignored rows for jsonName, cls in tables.iteritems(): - f = open(os.path.join(args.json, "{}.json".format(jsonName))) + f = open(os.path.join(jsonPath, "{}.json".format(jsonName))) data[jsonName] = json.load(f, encoding='cp1252') # Do some preprocessing to make our job easier