[37] Fixes imdb_list and imdb_chart (Kometa-Team#2092)

ohouigheighi · May 31, 2024 · 27a6c48 · 27a6c48
1 parent 9a768a7
commit 27a6c48
Show file tree

Hide file tree

Showing 8 changed files with 233 additions and 204 deletions.
diff --git a/.github/.wordlist.txt b/.github/.wordlist.txt
@@ -252,6 +252,7 @@ SciFi
 ScudLee
 SDTV
 SemVer
+setuptools
 ShawShank
 Skywalker
 Sohjiro

diff --git a/CHANGELOG b/CHANGELOG
@@ -1,12 +1,18 @@
 # Requirements Update (requirements will need to be reinstalled)
 Updated PlexAPI requirement to 4.15.13
+Update lxml requirement to 5.2.2
+Update requests requirement to 2.32.3
+Update schedule requirement to 1.2.2
+Update setuptools requirement to 70.0.0
 
 # Removed Features
 
 # New Features
 Checks requirement versions to print a message if one needs to be updated
 Added the `mass_added_at_update` operation to mass set the Added At field of Movies and Shows.
 Add automated Anime Aggregations for AniDB matching
+Added `top_tamil`, `top_telugu`, `top_malayalam`, `trending_india`, `trending_tamil`, and `trending_telugu` as options for `imdb_chart`
+Adds the `sort_by` attribute to `imdb_list`
 
 # Updates
 Changed the `overlay_artwork_filetype` Setting to accept `webp_lossy` and `webp_lossless` while the old attribute `webp` will be treated as `webp_lossy`.
@@ -19,5 +25,7 @@ Fixes #2034 `anilist_userlist` `score` attribute wasn't being validated correctl
 Fixes #1367 Error when trying to symlink the logs folder
 Fixes #2028 TMDb IDs were being ignored on the report
 Fixes a bug when parsing a comma-separated string of ints
+Fixes `imdb_chart` only getting 25 results
+Fixes `imdb_list` not returning items
 
 Various other Minor Fixes
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.1-build36
+2.0.1-build37
diff --git a/docs/files/builders/imdb.md b/docs/files/builders/imdb.md
@@ -31,16 +31,22 @@ The expected input are the options below. Multiple values are supported as eithe
 
 The `sync_mode: sync` and `collection_order: custom` Setting are recommended since the lists are continuously updated and in a specific order.
 
-| Name                                                                           | Attribute        |             Works with Movies              |              Works with Shows              |
-|:-------------------------------------------------------------------------------|:-----------------|:------------------------------------------:|:------------------------------------------:|
-| [Box Office](https://www.imdb.com/chart/boxoffice)                             | `box_office`     | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
-| [Most Popular Movies](https://www.imdb.com/chart/moviemeter)                   | `popular_movies` | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
-| [Top 250 Movies](https://www.imdb.com/chart/top)                               | `top_movies`     | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
-| [Top Rated English Movies](https://www.imdb.com/chart/top-english-movies)      | `top_english`    | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
-| [Most Popular TV Shows](https://www.imdb.com/chart/tvmeter)                    | `popular_shows`  |  :fontawesome-solid-circle-xmark:{ .red }  | :fontawesome-solid-circle-check:{ .green } |
-| [Top 250 TV Shows](https://www.imdb.com/chart/toptv)                           | `top_shows`      |  :fontawesome-solid-circle-xmark:{ .red }  | :fontawesome-solid-circle-check:{ .green } |
-| [Top Rated Indian Movies](https://www.imdb.com/india/top-rated-indian-movies/) | `top_indian`     | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
-| [Lowest Rated Movies](https://www.imdb.com/chart/bottom)                       | `lowest_rated`   | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| Name                                                                                 | Attribute         |             Works with Movies              |              Works with Shows              |
+|:-------------------------------------------------------------------------------------|:------------------|:------------------------------------------:|:------------------------------------------:|
+| [Box Office](https://www.imdb.com/chart/boxoffice)                                   | `box_office`      | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Most Popular Movies](https://www.imdb.com/chart/moviemeter)                         | `popular_movies`  | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top 250 Movies](https://www.imdb.com/chart/top)                                     | `top_movies`      | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top Rated English Movies](https://www.imdb.com/chart/top-english-movies)            | `top_english`     | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Most Popular TV Shows](https://www.imdb.com/chart/tvmeter)                          | `popular_shows`   |  :fontawesome-solid-circle-xmark:{ .red }  | :fontawesome-solid-circle-check:{ .green } |
+| [Top 250 TV Shows](https://www.imdb.com/chart/toptv)                                 | `top_shows`       |  :fontawesome-solid-circle-xmark:{ .red }  | :fontawesome-solid-circle-check:{ .green } |
+| [Lowest Rated Movies](https://www.imdb.com/chart/bottom)                             | `lowest_rated`    | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top Rated Indian Movies](https://www.imdb.com/india/top-rated-indian-movies/)       | `top_indian`      | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top Rated Tamil Movies](https://www.imdb.com/india/top-rated-tamil-movies/)         | `top_tamil`       | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top Rated Telugu Movies](https://www.imdb.com/india/top-rated-telugu-movies/)       | `top_telugu`      | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Top Rated Malayalam Movies](https://www.imdb.com/india/top-rated-malayalam-movies/) | `top_malayalam`   | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Trending Indian Movies & Shows](https://www.imdb.com/india/upcoming/)               | `trending_india`  | :fontawesome-solid-circle-check:{ .green } | :fontawesome-solid-circle-check:{ .green } |
+| [Trending Tamil Movies](https://www.imdb.com/india/tamil/)                           | `trending_tamil`  | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
+| [Trending Telugu Movies](https://www.imdb.com/india/telugu/)                         | `trending_telugu` | :fontawesome-solid-circle-check:{ .green } |  :fontawesome-solid-circle-xmark:{ .red }  |
 
 ```yaml
 collections:
@@ -62,34 +68,48 @@ collections:
 
 Finds every item in an IMDb List.
 
-The expected input is an IMDb List URL. Multiple values are supported as a list only a comma-separated string will not work.
+| List Parameter | Description                                                                                                                                                                                                                                                                                                                                   |
+|:---------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `list_id`      | Specify the IMDb List ID. **This attribute is required.**<br>**Options:** The ID that starts with `ls` found in the URL of the list. (ex. `ls005526372`)                                                                                                                                                                                      |
+| `limit`        | Specify how items you want returned by the query.<br>**Options:** Any Integer `0` or greater where `0` get all items.<br>**Default:** `0`                                                                                                                                                                                                     |
+| `sort_by`      | Choose from one of the many available sort options.<br>**Options:** `custom.asc`, `custom.desc`, `title.asc`, `title.desc`, `rating.asc`, `rating.desc`, `popularity.asc`, `popularity.desc`, `votes.asc`, `votes.desc`, `release.asc`, `release.desc`, `runtime.asc`, `runtime.desc`, `added.asc`, `added.desc`<br>**Default:** `custom.asc` |
+
+Multiple values are supported as a list only a comma-separated string will not work.
 
 The `sync_mode: sync` and `collection_order: custom` Setting are recommended since the lists are continuously updated and in a specific order.
 
 ```yaml
 collections:
   James Bonds:
-    imdb_list: https://www.imdb.com/list/ls006405458
+    imdb_list: 
+      list_id: ls006405458
+      limit: 100
+      sort_by: rating.asc
     collection_order: custom
     sync_mode: sync
 ```
 
-You can also limit the number of items to search for by using the `limit` and `url` parameters under `imdb_list`.
+You can search multiple lists in one collection by using a list.
 
 ```yaml
 collections:
   Christmas:
     imdb_list:
-      - url: https://www.imdb.com/list/ls025976544/
+      - list_id: ls025976544
         limit: 10
-      - url: https://www.imdb.com/list/ls003863000/
+        sort_by: rating.asc
+      - list_id: ls003863000
         limit: 10
-      - url: https://www.imdb.com/list/ls027454200/
+        sort_by: rating.asc
+      - list_id: ls027454200
         limit: 10
-      - url: https://www.imdb.com/list/ls027886673/
+        sort_by: rating.asc
+      - list_id: ls027886673
         limit: 10
-      - url: https://www.imdb.com/list/ls097998599/
+        sort_by: rating.asc
+      - list_id: ls097998599
         limit: 10
+        sort_by: rating.asc
     sync_mode: sync
     collection_order: alpha
 ```
@@ -184,7 +204,7 @@ The `sync_mode: sync` and `collection_order: custom` Setting are recommended sin
 
 | Search Parameter        | Description                                                                                                                                                                                                                                                                                                                                                                                       |
 |:------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `limit`                 | Specify how items you want returned by the query.<br>**Options:** Any Integer greater than `0`<br>**Default:** `100`                                                                                                                                                                                                                                                                              |
+| `limit`                 | Specify how items you want returned by the query.<br>**Options:** Any Integer `0` or greater where `0` get all items.<br>**Default:** `100`                                                                                                                                                                                                                                                       |
 | `sort_by`               | Choose from one of the many available sort options.<br>**Options:** `popularity.asc`, `popularity.desc`, `title.asc`, `title.desc`, `rating.asc`, `rating.desc`, `votes.asc`, `votes.desc`, `box_office.asc`, `box_office.desc`, `runtime.asc`, `runtime.desc`, `year.asc`, `year.desc`, `release.asc`, `release.desc`<br>**Default:** `popularity.asc`                                           |
 | `title`                 | Search by title name.<br>**Options:** Any String                                                                                                                                                                                                                                                                                                                                                  |
 | `type`                  | Item must match at least one given type. Can be a comma-separated list.<br>**Options:** `movie`, `tv_series`, `short`, `tv_episode`, `tv_mini_series`, `tv_movie`, `tv_special`, `tv_short`, `video_game`, `video`, `music_video`, `podcast_series`, `podcast_episode`                                                                                                                            |

diff --git a/docs/files/filters.md b/docs/files/filters.md
@@ -241,7 +241,8 @@ collections:
 ```yaml
 collections:
   Daniel Craig only James Bonds:
-    imdb_list: https://www.imdb.com/list/ls006405458/
+    imdb_list:
+      list_id: ls006405458
     filters:
       actor: Daniel Craig
 ```

diff --git a/modules/builder.py b/modules/builder.py
@@ -1479,7 +1479,7 @@ def _imdb(self, method_name, method_data):
                     raise Failed(f"{self.Type} Error: imdb_id {value} must begin with tt")
         elif method_name == "imdb_list":
             try:
-                for imdb_dict in self.config.IMDb.validate_imdb_lists(self.Type, method_data, self.language):
+                for imdb_dict in self.config.IMDb.validate_imdb_lists(self.Type, method_data):
                     self.builders.append((method_name, imdb_dict))
             except Failed as e:
                 logger.error(e)
@@ -1739,9 +1739,8 @@ def _mal(self, method_name, method_data):
                         final_attributes["letter"] = util.parse(self.Type, "prefix", dict_data, methods=dict_methods, parent=method_name)
                         final_text += f"\nPrefix: {final_attributes['letter']}"
                     if "type" in dict_methods:
-                        type_list = util.parse(self.Type, "type", dict_data, datatype="commalist", methods=dict_methods, parent=method_name, options=mal.search_types)
-                        final_attributes["type"] = ",".join(type_list)
-                        final_text += f"\nType: {' or '.join(type_list)}"
+                        final_attributes["type"] = util.parse(self.Type, "type", dict_data, methods=dict_methods, parent=method_name, options=mal.search_types)
+                        final_text += f"\nType: {final_attributes['type']}"
                     if "status" in dict_methods:
                         final_attributes["status"] = util.parse(self.Type, "status", dict_data, methods=dict_methods, parent=method_name, options=mal.search_status)
                         final_text += f"\nStatus: {final_attributes['status']}"