X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=market.py;h=7a37cf622aed28899f4815cd1b388e89e0a98a34;hb=18de421e455ab4b125a6684d703a296562097e6b;hp=ac3aa14a9213ba817db4a431cbc3ddd0649e460e;hpb=341a4b07e8c205711fff0e93dd3679708828a961;p=perso%2FImmae%2FProjets%2FCryptomonnaies%2FCryptoportfolio%2FTrader.git diff --git a/market.py b/market.py index ac3aa14..7a37cf6 100644 --- a/market.py +++ b/market.py @@ -5,6 +5,7 @@ import psycopg2 from store import * from cachetools.func import ttl_cache from datetime import datetime +import datetime from retry import retry import portfolio @@ -25,9 +26,11 @@ class Market: self.balances = BalanceStore(self) self.processor = Processor(self) - for key in ["user_id", "market_id", "report_path", "pg_config"]: + for key in ["user_id", "market_id", "pg_config"]: setattr(self, key, kwargs.get(key, None)) + self.report.log_market(self.args) + @classmethod def from_config(cls, config, args, **kwargs): config["apiKey"] = config.pop("key", None) @@ -38,15 +41,15 @@ class Market: def store_report(self): self.report.merge(Portfolio.report) - date = datetime.now() - if self.report_path is not None: + date = datetime.datetime.now() + if self.args.report_path is not None: self.store_file_report(date) - if self.pg_config is not None: + if self.pg_config is not None and self.args.report_db: self.store_database_report(date) def store_file_report(self, date): try: - report_file = "{}/{}_{}".format(self.report_path, date.isoformat(), self.user_id) + report_file = "{}/{}_{}".format(self.args.report_path, date.isoformat(), self.user_id) with open(report_file + ".json", "w") as f: f.write(self.report.to_json()) with open(report_file + ".log", "w") as f: