Skip to content

Commit

Permalink
refactor: rename content argument as data
Browse files Browse the repository at this point in the history
  • Loading branch information
rilshok committed Nov 30, 2024
1 parent 0742fec commit aeefc48
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 57 deletions.
14 changes: 7 additions & 7 deletions src/iokit/extensions/audio.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class AudioState(State, suffix=""):
def __init__(
self,
content: "Waveform",
data: "Waveform",
/,
name: str | StateName = "",
*,
Expand All @@ -24,8 +24,8 @@ def __init__(
with BytesIO() as buffer:
soundfile.write(
file=buffer,
data=content.wave,
samplerate=content.freq,
data=data.wave,
samplerate=data.freq,
format=self._suffix,
)
super().__init__(buffer.getvalue(), name=name, time=time)
Expand Down Expand Up @@ -104,14 +104,14 @@ def to_mono(self) -> "Waveform":
return self.copy()
return Waveform(self.wave.mean(axis=1), self.freq)

def to_flac(self, name: str, *, time: datetime | None = None) -> Flac:
def to_flac(self, name: str | StateName, *, time: datetime | None = None) -> Flac:
return Flac(self, name=name, time=time)

def to_wav(self, name: str, *, time: datetime | None = None) -> Wav:
def to_wav(self, name: str | StateName, *, time: datetime | None = None) -> Wav:
return Wav(self, name=name, time=time)

def to_mp3(self, name: str, *, time: datetime | None = None) -> Mp3:
def to_mp3(self, name: str | StateName, *, time: datetime | None = None) -> Mp3:
return Mp3(self, name=name, time=time)

def to_ogg(self, name: str, *, time: datetime | None = None) -> Ogg:
def to_ogg(self, name: str | StateName, *, time: datetime | None = None) -> Ogg:
return Ogg(self, name=name, time=time)
32 changes: 16 additions & 16 deletions src/iokit/extensions/auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@


def auto_state(
content: Any,
data: Any,
/,
name: str | StateName = "",
*,
Expand All @@ -33,7 +33,7 @@ def auto_state(
) -> State:
if password is not None:
state = auto_state(
content,
data,
name=name,
time=time,
compression=compression,
Expand All @@ -44,45 +44,45 @@ def auto_state(
return Enc(state, password=password, name=name, time=time)
if compression is not None:
state = auto_state(
content,
data,
name=name,
time=time,
waveform_to=waveform_to,
dataframe_to=dataframe_to,
builtin_to=builtin_to,
)
return Gzip(state, time=time, compression=int(compression))
match content:
match data:
case ndarray():
return Npy(content, name=name, time=time)
return Npy(data, name=name, time=time)
case DataFrame():
match dataframe_to:
case "csv":
return Csv(content, name=name, time=time)
return Csv(data, name=name, time=time)
case "tsv":
return Tsv(content, name=name, time=time)
return Tsv(data, name=name, time=time)
case Waveform():
match waveform_to:
case "wav":
return content.to_wav(name=name, time=time)
return data.to_wav(name=name, time=time)
case "flac":
return content.to_flac(name=name, time=time)
return data.to_flac(name=name, time=time)
case "mp3":
return content.to_mp3(name=name, time=time)
return data.to_mp3(name=name, time=time)
case "ogg":
return content.to_ogg(name=name, time=time)
return data.to_ogg(name=name, time=time)
case SecretState():
return Enc(content, name=name, time=time)
return Enc(data, name=name, time=time)
case bytes():
return Dat(content, name=name, time=time)
return Dat(data, name=name, time=time)
case str():
return Txt(content, name=name, time=time)
return Txt(data, name=name, time=time)
case dict() | int() | float() | bool():
match builtin_to:
case "json":
return Json(content, name=name, time=time)
return Json(data, name=name, time=time)
case "yaml":
return Yaml(content, name=name, time=time)
return Yaml(data, name=name, time=time)
case other:
msg = f"Unsupported record: {other}"
raise ValueError(msg)
4 changes: 2 additions & 2 deletions src/iokit/extensions/dat.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
class Dat(State, suffix="dat"):
def __init__(
self,
content: bytes,
data: bytes,
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
super().__init__(content, name=name, time=time)
super().__init__(data, name=name, time=time)

def load(self) -> bytes:
return self.data
10 changes: 5 additions & 5 deletions src/iokit/extensions/enc.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,23 +103,23 @@ def pack(cls, state: State, password: bytes | str, salt: bytes | str = DEFAULT_S
class Enc(State, suffix="enc"):
def __init__(
self,
content: State | SecretState,
data: State | SecretState,
/,
name: str | StateName = "",
*,
password: bytes | str | None = None,
salt: bytes | str = DEFAULT_SALT,
time: datetime | None = None,
) -> None:
if isinstance(content, SecretState):
if isinstance(data, SecretState):
if password is not None:
raise ValueError("Cannot encrypt already encrypted content.")
return super().__init__(content.data, name=name or "", time=time)
return super().__init__(data.data, name=name or "", time=time)
if password is None:
raise ValueError("Password is required for encryption.")
super().__init__(
SecretState.pack(state=content, password=password, salt=salt).data,
name=name or str(content.name),
SecretState.pack(state=data, password=password, salt=salt).data,
name=name or str(data.name),
time=time,
)

Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@
class Env(State, suffix="env"):
def __init__(
self,
content: dict[str, str],
data: dict[str, str],
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
with TemporaryDirectory() as root:
path = Path(root) / "env"
for key, value in content.items():
for key, value in data.items():
dotenv.set_key(
dotenv_path=path,
key_to_set=key,
Expand Down
6 changes: 3 additions & 3 deletions src/iokit/extensions/gz.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class Gzip(State, suffix="gz"):
def __init__(
self,
content: State,
data: State,
/,
*,
compression: int = 1,
Expand All @@ -19,8 +19,8 @@ def __init__(
with BytesIO() as buffer:
gzip_file = gzip.GzipFile(fileobj=buffer, mode="wb", compresslevel=compression, mtime=0)
with gzip_file as gzip_buffer:
gzip_buffer.write(content.data)
super().__init__(buffer.getvalue(), name=content.name, time=time)
gzip_buffer.write(data.data)
super().__init__(buffer.getvalue(), name=data.name, time=time)

def load(self) -> State:
with gzip.GzipFile(fileobj=self.buffer, mode="rb") as file:
Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
class ImageState(State, suffix=""):
def __init__(
self,
content: Image.Image,
data: Image.Image,
/,
name: str | StateName = "",
*,
time: datetime | None = None,
):
with BytesIO() as buffer:
content.save(buffer, format=self._suffix)
data.save(buffer, format=self._suffix)
super().__init__(buffer.getvalue(), name=name, time=time)

def load(self) -> Image.Image:
Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/json.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def json_dumps(
class Json(State, suffix="json"):
def __init__(
self,
content: Any,
data: Any,
/,
name: str | StateName = "",
*,
Expand All @@ -39,7 +39,7 @@ def __init__(
time: datetime | None = None,
):
dumps = json_dumps(compact=compact, ensure_ascii=ensure_ascii, allow_nan=allow_nan)
super().__init__(dumps(content).encode("utf-8"), name=name, time=time)
super().__init__(dumps(data).encode("utf-8"), name=name, time=time)

def load(self) -> Any:
return json.load(self.buffer)
4 changes: 2 additions & 2 deletions src/iokit/extensions/jsonl.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class Jsonl(State, suffix="jsonl"):
def __init__(
self,
content: Iterable[dict[str, Any]],
data: Iterable[dict[str, Any]],
/,
name: str | StateName = "",
*,
Expand All @@ -27,7 +27,7 @@ def __init__(
with BytesIO() as buffer:
dumps = json_dumps(compact=compact, ensure_ascii=ensure_ascii, allow_nan=allow_nan)
with Writer(buffer, compact=compact, sort_keys=False, dumps=dumps) as writer:
for item in content:
for item in data:
writer.write(item)
super().__init__(buffer.getvalue(), name=name, time=time)

Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/npy.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
class Npy(State, suffix="npy"):
def __init__(
self,
content: NDArray[Any],
data: NDArray[Any],
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
with BytesIO() as buffer:
np.save(buffer, content, allow_pickle=False, fix_imports=False)
np.save(buffer, data, allow_pickle=False, fix_imports=False)
super().__init__(buffer.getvalue(), name=name, time=time)

def load(self) -> NDArray[Any]:
Expand Down
8 changes: 4 additions & 4 deletions src/iokit/extensions/table.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
class Csv(State, suffix="csv"):
def __init__(
self,
content: DataFrame,
data: DataFrame,
/,
name: str | StateName = "",
*,
index: bool = False,
time: datetime | None = None,
) -> None:
with BytesIO() as buffer:
content.to_csv(buffer, index=index)
data.to_csv(buffer, index=index)
super().__init__(buffer.getvalue(), name=name, time=time)

def load(self) -> DataFrame:
Expand All @@ -29,15 +29,15 @@ def load(self) -> DataFrame:
class Tsv(State, suffix="tsv"):
def __init__(
self,
content: DataFrame,
data: DataFrame,
/,
name: str | StateName = "",
*,
index: bool = False,
time: datetime | None = None,
) -> None:
with BytesIO() as buffer:
content.to_csv(buffer, sep="\t", index=index)
data.to_csv(buffer, sep="\t", index=index)
super().__init__(buffer.getvalue(), name=name, time=time)

def load(self) -> DataFrame:
Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/tar.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
class Tar(State, suffix="tar"):
def __init__(
self,
content: Iterable[State],
data: Iterable[State],
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
with BytesIO() as buffer:
with tarfile.open(fileobj=buffer, mode="w") as tar_buffer:
for state in content:
for state in data:
file_data = tarfile.TarInfo(name=str(state.name))
file_data.size = state.size
file_data.mtime = int(state.time.timestamp())
Expand Down
4 changes: 2 additions & 2 deletions src/iokit/extensions/txt.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
class Txt(State, suffix="txt"):
def __init__(
self,
content: str,
data: str,
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
super().__init__(content.encode("utf-8"), name=name, time=time)
super().__init__(data.encode("utf-8"), name=name, time=time)

def load(self) -> str:
return self.data.decode("utf-8")
4 changes: 2 additions & 2 deletions src/iokit/extensions/yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
class Yaml(State, suffix="yaml"):
def __init__(
self,
content: Any,
data: Any,
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
super().__init__(yaml.safe_dump(content).encode("utf-8"), name=name, time=time)
super().__init__(yaml.safe_dump(data).encode("utf-8"), name=name, time=time)

def load(self) -> Any:
return yaml.safe_load(self.buffer)
4 changes: 2 additions & 2 deletions src/iokit/extensions/zip.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
class Zip(State, suffix="zip"):
def __init__(
self,
content: Iterable[State],
data: Iterable[State],
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
with BytesIO() as buffer:
with zipfile.ZipFile(buffer, mode="w") as zip_buffer:
for state in content:
for state in data:
zip_buffer.writestr(str(state.name), data=state.data)

super().__init__(buffer.getvalue(), name=name, time=time)
Expand Down
4 changes: 2 additions & 2 deletions src/iokit/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ class State:

def __init__(
self,
content: bytes,
data: bytes,
/,
name: str | StateName = "",
*,
time: datetime | None = None,
) -> None:
self._data = content
self._data = data
self._name = StateName.make(name, self._suffix)
self._time = time or now()

Expand Down

0 comments on commit aeefc48

Please sign in to comment.