Skip to content

Commit

Permalink
Merge pull request #112 from Javakky/javakky/update-api-endpoint
Browse files Browse the repository at this point in the history
feat: 検索 API のエンドポイント修正対応
  • Loading branch information
Javakky authored Dec 5, 2024
2 parents 86acc75 + 5559fad commit 6e96adc
Show file tree
Hide file tree
Showing 7 changed files with 414 additions and 330 deletions.
2 changes: 1 addition & 1 deletion examples/json_filter.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def main():
.user_agent("NicoApiClient", "0.5.0")
)

# https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=title&_sort=-viewCounter&jsonFilter=%7B%22type%22%3A+%22or%22%2C+%22filters%22%3A+%5B%7B%22type%22%3A+%22range%22%2C+%22field%22%3A+%22startTime%22%2C+%22from%22%3A+%222021-01-01T00%3A00%3A00%2B09%3A00%22%2C+%22include_lower%22%3A+true%2C+%22include_upper%22%3A+true%7D%2C+%7B%22type%22%3A+%22range%22%2C+%22field%22%3A+%22startTime%22%2C+%22to%22%3A+%222010-01-01T00%3A00%3A00%2B09%3A00%22%2C+%22include_lower%22%3A+true%2C+%22include_upper%22%3A+true%7D%5D%7D
# https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=title&_sort=-viewCounter&jsonFilter=%7B%22type%22%3A+%22or%22%2C+%22filters%22%3A+%5B%7B%22type%22%3A+%22range%22%2C+%22field%22%3A+%22startTime%22%2C+%22from%22%3A+%222021-01-01T00%3A00%3A00%2B09%3A00%22%2C+%22include_lower%22%3A+true%2C+%22include_upper%22%3A+true%7D%2C+%7B%22type%22%3A+%22range%22%2C+%22field%22%3A+%22startTime%22%2C+%22to%22%3A+%222010-01-01T00%3A00%3A00%2B09%3A00%22%2C+%22include_lower%22%3A+true%2C+%22include_upper%22%3A+true%7D%5D%7D
print(request.build_url())
print(request.request().json())

Expand Down
2 changes: 1 addition & 1 deletion examples/multiple.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def main():
.user_agent("NicoApiClient", "0.5.0")
)

# https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=contentId%2Ctitle&_sort=-viewCounter
# https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=contentId%2Ctitle&_sort=-viewCounter
print(request.build_url())

# 実行
Expand Down
2 changes: 1 addition & 1 deletion examples/simple.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def main():
.user_agent("NicoApiClient", "0.5.0")
)

# https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=contentId%2Ctitle&_sort=-viewCounter
# https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search?targets=tagsExact&q=VOCALOID&fields=contentId%2Ctitle&_sort=-viewCounter
print(request.build_url())

# 実行
Expand Down
4 changes: 2 additions & 2 deletions nicovideo_api_client/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ class FieldType(Enum):

DEFAULT_RETRY = 3

END_POINT_URL_V2 = "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
END_POINT_URL_V2 = "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
END_POINT_URL_VIDEO = "https://www.nicovideo.jp/watch/"
END_POINT_URL_V2_VERSION = "https://api.search.nicovideo.jp/api/v2/snapshot/version"
END_POINT_URL_V2_VERSION = "https://snapshot.search.nicovideo.jp/api/v2/snapshot/version"

sort_types = [
FieldType.VIEW_COUNTER,
Expand Down
719 changes: 402 additions & 317 deletions poetry.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ pytest = "^7.3.2"
Sphinx = "^6.1.3"
taskipy = "^1.11.0"
pyproject-flake8 = "^6.0.0.post1"
install = "^1.3.5"
black = "^23.1"
isort = "5.12.0"

Expand Down
14 changes: 7 additions & 7 deletions tests/v2/test_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_build_url():
.user_agent("NicoApiClient", "0.5.0")
)
assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E3%83%86%E3%82%B9%E3%83%88&fields"
"=title&_sort=-viewCounter"
)
Expand All @@ -65,7 +65,7 @@ def test_build_url_query():
)

assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E6%AD%8C%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F+"
"%E5%88%9D%E9%9F%B3%E3%83%9F%E3%82%AF+OR+"
"%E9%8F%A1%E9%9F%B3%E3%83%AA%E3%83%B3&"
Expand All @@ -87,7 +87,7 @@ def test_build_url_single_query():
)

assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E6%AD%8C%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F"
"+OR+%E8%B8%8A%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F&fields=title&"
"_sort=-viewCounter"
Expand Down Expand Up @@ -121,7 +121,7 @@ def test_build_url_match_filter():
.user_agent("NicoApiClient", "0.5.0")
)
assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E6%AD%8C%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F&"
"fields=description%2CmylistCounter%2Ctitle%2CviewCounter&"
"_sort=-viewCounter&filters%5BviewCounter%5D%5B0%5D=100&"
Expand Down Expand Up @@ -160,7 +160,7 @@ def test_build_url_range_filter():
.user_agent("NicoApiClient", "0.5.0")
)
assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E6%AD%8C%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F&"
"fields=description%2CmylistCounter%2Ctitle%2CviewCounter&"
"_sort=-viewCounter&filters%5BviewCounter%5D%5Bgte%5D=1000&"
Expand Down Expand Up @@ -199,7 +199,7 @@ def test_url_builder_combi_filter():
.user_agent("NicoApiClient", "0.5.0")
)
assert (
actual.build_url(False) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(False) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=%E6%AD%8C%E3%81%A3%E3%81%A6%E3%81%BF%E3%81%9F&"
"fields=description%2CmylistCounter%2Ctitle%2CviewCounter&"
"_sort=-viewCounter&filters%5BviewCounter%5D%5B0%5D=1000&"
Expand Down Expand Up @@ -229,7 +229,7 @@ def test_build_url_jsonFilter():
.user_agent("NicoApiClient", "0.5.0")
)
assert (
actual.build_url(True) == "https://api.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
actual.build_url(True) == "https://snapshot.search.nicovideo.jp/api/v2/snapshot/video/contents/search"
"?targets=title&q=テスト&fields=title&_sort=-viewCounter&jsonFilter=%7B"
"%22type%22%3A+%22not%22%2C+%22filter%22%3A+%7B%22type%22%3A+%22range%22%2C"
"+%22field%22%3A+%22startTime%22%2C+%22to%22%3A+%222021-01-01T00%3A00%3A00"
Expand Down

0 comments on commit 6e96adc

Please sign in to comment.