Skip to content

UNSETめんどくさいな… #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtnb75 merged 1 commit into from
Nov 9, 2025
Merged

UNSETめんどくさいな… #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions log2s3/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ def _(
"region_name": s3_region,
"endpoint_url": s3_endpoint,
}
empty_keys = {k for k, v in args.items() if v is None}
empty_keys = {k for k, v in args.items() if v is None or v == UNSET}
for k in empty_keys:
args.pop(k)
s3 = boto3.client("s3", **args)
Expand Down Expand Up @@ -956,14 +956,14 @@ def arg2arg(fn: click.Command, args: dict, baseparam: dict) -> dict:
break
elif isinstance(opt.envvar, str) and opt.envvar and os.getenv(opt.envvar):
params[opt.name] = os.getenv(opt.envvar)
elif (opt.default or not opt.required) and opt.default != UNSET:
elif opt.default or not opt.required:
params[opt.name] = opt.default
pnames = [x.name for x in fn.params]
for name in pnames:
if name in args:
if args[name] != UNSET:
params[name] = args[name]
elif name in baseparam and baseparam[name] != UNSET:
elif name in baseparam:
params[name] = baseparam[name]
_log.debug("arg=%s, base=%s, result=%s", args, baseparam, params)
return params
Expand Down
16 changes: 8 additions & 8 deletions log2s3/processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ def __init__(self, config: dict = {}):
self.skipped = 0

def check_date_range(self, mtime: float) -> bool:
if "older" in self.config:
if "older" in self.config and self.config["older"] != UNSET:
older = pytimeparse.parse(self.config["older"])
if older is not None and mtime > time.time() - older:
return False
if "newer" in self.config:
if "newer" in self.config and self.config["newer"] != UNSET:
newer = pytimeparse.parse(self.config["newer"])
if newer is not None and mtime < time.time() - newer:
return False
Expand All @@ -52,27 +52,27 @@ def check_date_range(self, mtime: float) -> bool:
return True

def check_size_range(self, size: int) -> bool:
if "smaller" in self.config:
if "smaller" in self.config and self.config["smaller"] != UNSET:
smaller = humanfriendly.parse_size(self.config["smaller"], True)
if size > smaller:
return False
if "bigger" in self.config:
if "bigger" in self.config and self.config["bigger"] != UNSET:
bigger = humanfriendly.parse_size(self.config["bigger"], True)
if size < bigger:
return False
return True

def check_name(self, fname: pathlib.Path) -> bool:
if "suffix" in self.config:
if "suffix" in self.config and self.config["suffix"] != UNSET:
if not str(fname).endswith(self.config["suffix"]):
return False
if "prefix" in self.config:
if "prefix" in self.config and self.config["prefix"] != UNSET:
if not str(fname).startswith(self.config["prefix"]):
return False
if "glob" in self.config:
if "glob" in self.config and self.config["glob"] != UNSET:
if not fname.match(self.config["glob"]):
return False
if "iglob" in self.config:
if "iglob" in self.config and self.config["iglob"] != UNSET:
if not fname.match(self.config["iglob"], case_sensitive=False):
return False
return True
Expand Down
Loading