diff --git a/nc_password_client/nc_password_client.py b/nc_password_client/nc_password_client.py index 3a91384..59d35e8 100755 --- a/nc_password_client/nc_password_client.py +++ b/nc_password_client/nc_password_client.py @@ -213,38 +213,11 @@ class NextcloudHandler: self._log = logging.getLogger("nc_password_client") self._log.setLevel(logging.DEBUG) - sysloghandler = SysLogHandler() - sysloghandler.setLevel(logging.DEBUG) - self._log.addHandler(sysloghandler) - streamhandler = logging.StreamHandler(sys.stdout) streamhandler.setLevel( logging.getLevelName(params.get("debug_level", 'INFO')) ) self._log.addHandler(streamhandler) - - if 'log_file' in params: - log_file = params['log_file'] - else: - home_folder = os.environ.get( - 'HOME', os.environ.get('USERPROFILE', '') - ) - log_folder = os.path.join(home_folder, "log") - log_file = os.path.join(log_folder, "nc_password_client.log") - - if not os.path.exists(os.path.dirname(log_file)): - os.mkdir(os.path.dirname(log_file)) - - filehandler = logging.handlers.RotatingFileHandler( - log_file, maxBytes=102400000 - ) - # create formatter - formatter = logging.Formatter( - '%(asctime)s %(name)-12s %(levelname)-8s %(message)s' - ) - filehandler.setFormatter(formatter) - filehandler.setLevel(logging.DEBUG) - self._log.addHandler(filehandler) return True def headers(self): @@ -987,47 +960,27 @@ class NcPasswordClient: for item in self.nc.list_passwords(): safer_obj = dict(item, **{ 'password': '***' }) self.debug( - { "action": "delete_all_passwords", "message": "Deleting password", "object": safer_obj } + { + "action": "delete_all_passwords", + "message": "Deleting password", + "object": safer_obj + } ) self.nc.delete_password(item) + + def remove_duplicates(self): + return True def _init_log(self): ''' Initialize log object ''' self._log = logging.getLogger("nc_password_client") self._log.setLevel(logging.DEBUG) - sysloghandler = SysLogHandler() - sysloghandler.setLevel(logging.DEBUG) - self._log.addHandler(sysloghandler) - streamhandler = logging.StreamHandler(sys.stdout) streamhandler.setLevel( logging.getLevelName(self.config.get("debug_level", 'INFO')) ) self._log.addHandler(streamhandler) - - if 'log_file' in self.config: - log_file = self.config['log_file'] - else: - home_folder = os.environ.get( - 'HOME', os.environ.get('USERPROFILE', '') - ) - log_folder = os.path.join(home_folder, "log") - log_file = os.path.join(log_folder, "nc_password_client.log") - - if not os.path.exists(os.path.dirname(log_file)): - os.mkdir(os.path.dirname(log_file)) - - filehandler = logging.handlers.RotatingFileHandler( - log_file, maxBytes=102400000 - ) - # create formatter - formatter = logging.Formatter( - '%(asctime)s %(name)-12s %(levelname)-8s %(message)s' - ) - filehandler.setFormatter(formatter) - filehandler.setLevel(logging.DEBUG) - self._log.addHandler(filehandler) return True @@ -1138,6 +1091,13 @@ def create_passwords_folder(ctx, name): '''Create a password folder''' ctx.obj['NcPasswordClient'].create_passwords_folder(name) +@cli.command() +@click_config_file.configuration_option() +@click.pass_context +def remove_duplicates(ctx): + '''Remove duplicate passwords''' + ctx.obj['NcPasswordClient'].remove_duplicates() + @cli.command() @click_config_file.configuration_option() @click.pass_context