niu/mdrs-client-python
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migrate obsoleted function parse_obj_as to TypeAdapter().validate_python().

Browse Source
This commit is contained in:
Yoshihiro OKUMURA
2023-07-19 14:43:16 +09:00
parent b569c20b6e
commit 23025bd679
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mdrsclient/commands/mkdir.py
View File

@ -1,5 +1,6 @@
import os
from argparse import Namespace, _SubParsersAction
from unicodedata import normalize
from mdrsclient.api import FolderApi
from mdrsclient.commands.base import BaseCommand
@ -25,4 +26,4 @@ class MkdirCommand(BaseCommand):
if parent_folder.find_sub_folder(r_basename) is not None or parent_folder.find_file(r_basename) is not None:
raise IllegalArgumentException(f"Cannot create folder `{r_path}`: File exists.")
folder_api = FolderApi(connection)
folder_api.create(r_basename, parent_folder.id)
folder_api.create(normalize("NFC", r_basename), parent_folder.id)

6
mdrsclient/commands/mv.py
View File

@ -3,7 +3,7 @@ import os
from argparse import Namespace, _SubParsersAction
from unicodedata import normalize
from pydantic import parse_obj_as
from pydantic import TypeAdapter
from mdrsclient.api import FileApi, FolderApi
from mdrsclient.commands.base import BaseCommand
@ -52,7 +52,7 @@ class MvCommand(BaseCommand):
file_api = FileApi(connection)
if s_parent_folder.id != d_parent_folder.id or d_basename != s_basename:
d_file_dict = dataclasses.asdict(s_file) | {"name": normalize("NFC", d_basename)}
d_file = parse_obj_as(File, d_file_dict)
d_file = TypeAdapter(File).validate_python(d_file_dict)
file_api.move(d_file, d_parent_folder.id)
else:
s_folder = s_parent_folder.find_sub_folder(s_basename)
@ -71,5 +71,5 @@ class MvCommand(BaseCommand):
folder_api.move(s_folder, d_parent_folder.id)
if s_basename != d_basename:
d_folder_dict = dataclasses.asdict(s_folder) | {"name": normalize("NFC", d_basename)}
d_folder = parse_obj_as(FolderSimple, d_folder_dict)
d_folder = TypeAdapter(FolderSimple).validate_python(d_folder_dict)
folder_api.update(d_folder)