search

ZeroQI / Hama.bundle

Plex HTTP Anidb Metadata Agent (HAMA)
GNU General Public License v3.0
1.21k stars 113 forks source link

Issues in anidb->tvdb episode mapping #352

Closed EndOfLine369 closed 5 years ago

EndOfLine369 commented 5 years ago

EX: [ ] s0e12 s00e001 anidbid: air_date: 2014-12-06 seems to be seen as season 0 instead of s01e001.

=== Update() ================================================================================================================================================
id: anidb-9588, title: The Last: Naruto the Movie, lang: en, force: True, movie: False
start: 2019-10-06 01:30:41,573000
=== AnimeLists.GetMetadata() ================================================================================================================================
tvdb_numbering: False
Local custom mapping file not present: anime-list-custom.xml
--- AniDBTVDBMap --------------------------------------------------------------------------------------------------------------------------------------------
[+] AniDBid:  9588, TVDBid:  79824, defaulttvdbseason:   0, offset:  11, name: The Last: Naruto the Movie
             -----          ------
              9588           79824
[ ] collection: TVDBid '79824' is part of collection: '['Naruto Shippuden Collection']', related_anime_list: ['4880', '5178', '5914', '6503', '7483', '8159', '8312', '8384', '8387', '9023', '9588', '10961']
[ ] studio: 
--- return --------------------------------------------------------------------------------------------------------------------------------------------------
AniDB_id: '9588', AniDB_id2: '', AniDBid: '9588', TVDB_id: '', TVDB_id2: '79824', TVDBid: '79824'
mappingList: {
  'defaulttvdbseason': '0',
  'defaulttvdbseason_a': False,
  'episodeoffset': '11',
  'imdbid': 'tt3717532',
  'name': 'The Last: Naruto the Movie',
  'tvdbcount': 1}
AnimeLists_dict: {
  'collections': ['Naruto Shippuden Collection']}
=== common.GetMetadata() ====================================================================================================================================
not tvdb4 mode
=== TheTVDB.GetMetadata() ===================================================================================================================================
TVDBid: '79824', IMDbid: 'tt3717532', language_series : ['en', 'jap'], language_episodes: ['en', 'jap']
--- series --------------------------------------------------------------------------------------------------------------------------------------------------
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824?en', Filename: 'TheTVDB/json/79824\series_en.json', Age: '948.969826221', Ended: None
[ ] language_rank: 2
[ ] title: Naruto Shippuden
[ ] original_title: Naruto Shippuden
[ ] IMDbid: tt0988824
[ ] zap2itId: 
[ ] content_rating: TV-PG
[ ] originally_available_at: 2007-02-15
[ ] studio: TV Tokyo
[ ] rating: 8
[ ] status: Ended
[ ] genres: [u'Action', u'Adventure', u'Animation', u'Anime', u'Comedy', u'Drama']
[ ] duration: 1500000
[ ] banner: {u'https://thetvdb.plexapp.com/banners/graphical/79824-g4.jpg': (u'TheTVDB\\banner\\graphical/79824-g4.jpg', 1, None)}
--- actors --------------------------------------------------------------------------------------------------------------------------------------------------
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/actors', Filename: 'TheTVDB/json/79824\actors_en.json', Age: '948.774493456', Ended: None
[ ] role: Sakura Haruno                                     , name: Chie Nakamura       , photo: https://thetvdb.plexapp.com/banners/actors/72313.jpg
[ ] role: Sasuke Uchiha                                     , name: Noriaki Sugiyama    , photo: https://thetvdb.plexapp.com/banners/actors/72315.jpg
[ ] role: Gaara                                             , name: Akira Ishida        , photo: https://thetvdb.plexapp.com/banners/actors/72316.jpg
[ ] role: Itachi Uchiha                                     , name: Hideo Ishikawa      , photo: https://thetvdb.plexapp.com/banners/actors/72317.jpg
[ ] role: Jiraiya                                           , name: Hochu Otsuka        , photo: https://thetvdb.plexapp.com/banners/actors/72318.jpg
[ ] role: Deidara                                           , name: Katsuhiko Kawamoto  , photo: https://thetvdb.plexapp.com/banners/actors/72319.jpg
[ ] role: Kakashi Hatake                                    , name: Kazuhiko Inoue      , photo: https://thetvdb.plexapp.com/banners/actors/72320.jpg
[ ] role: Shizune                                           , name: Keiko Nemoto        , photo: https://thetvdb.plexapp.com/banners/actors/72321.jpg
[ ] role: Chouji Akimichi                                   , name: Kentaro Ito         , photo: https://thetvdb.plexapp.com/banners/actors/72322.jpg
[ ] role: Neji Hyuuga                                       , name: Koichi Tochika      , photo: https://thetvdb.plexapp.com/banners/actors/72323.jpg
[ ] role: Kiba Inuzuka                                      , name: Kosuke Toriumi      , photo: https://thetvdb.plexapp.com/banners/actors/72324.jpg
[ ] role: Orochimaru                                        , name: Kujira              , photo: https://thetvdb.plexapp.com/banners/actors/72325.jpg
[ ] role: Tsunade                                           , name: Masako Katsuki      , photo: https://thetvdb.plexapp.com/banners/actors/72326.jpg
[ ] role: Hinata Hyuuga                                     , name: Nana Mizuki         , photo: https://thetvdb.plexapp.com/banners/actors/72327.jpg
[ ] role: Kabuto Yakushi / Kabutorochimaru                  , name: Nobutoshi Kanna     , photo: https://thetvdb.plexapp.com/banners/actors/72328.jpg
[ ] role: Temari                                            , name: Romi Paku           , photo: https://thetvdb.plexapp.com/banners/actors/72329.jpg
[ ] role: Ino Yamanaka                                      , name: Ryoka Yuzuki        , photo: https://thetvdb.plexapp.com/banners/actors/72330.jpg
[ ] role: Shino Aburame                                     , name: Shinji Kawada       , photo: https://thetvdb.plexapp.com/banners/actors/72331.jpg
[ ] role: Shikamaru Nara                                    , name: Shotaro Morikubo    , photo: https://thetvdb.plexapp.com/banners/actors/72332.jpg
[ ] role: Kisame Hoshigaki                                  , name: Tomoyuki Dan        , photo: https://thetvdb.plexapp.com/banners/actors/72333.jpg
[ ] role: Kankuro                                           , name: Yasuyuki Kase       , photo: 
[ ] role: Rock-Lee                                          , name: Yoichi Masukawa     , photo: https://thetvdb.plexapp.com/banners/actors/72335.jpg
[ ] role: Tenten                                            , name: Yukari Tamura       , photo: https://thetvdb.plexapp.com/banners/actors/72336.jpg
[ ] role: Naruto Uzumaki                                    , name: Junko Takeuchi      , photo: https://thetvdb.plexapp.com/banners/actors/72338.jpg
[ ] role: Konohamaru                                        , name: Ikue Otani          , photo: https://thetvdb.plexapp.com/banners/actors/72342.jpg
[ ] role: Baki                                              , name: Joji Nakata         , photo: https://thetvdb.plexapp.com/banners/actors/72343.jpg
[ ] role: Asuma Sarutobi                                    , name: Jurota Kosugi       , photo: https://thetvdb.plexapp.com/banners/actors/72345.jpg
[ ] role: Gai Maito                                         , name: Masashi Ebara       , photo: https://thetvdb.plexapp.com/banners/actors/72346.jpg
[ ] role: Moegi                                             , name: Noriko Shitaya      , photo: https://thetvdb.plexapp.com/banners/actors/72348.jpg
[ ] role: Konan                                             , name: Atsuko Tanaka       , photo: https://thetvdb.plexapp.com/banners/actors/327133.jpg
[ ] role: Nagato                                            , name: Junpei Morita       , photo: https://thetvdb.plexapp.com/banners/actors/327134.jpg
[ ] role: Hidan                                             , name: Masaki Terasoma     , photo: https://thetvdb.plexapp.com/banners/actors/327135.jpg
[ ] role: Young Yahiko                                      , name: Wataru Hatano       , photo: https://thetvdb.plexapp.com/banners/actors/327136.jpg
[ ] role: Madara Uchiha                                     , name: Naoya Uchida        , photo: https://thetvdb.plexapp.com/banners/actors/327137.jpg
[ ] role: Zetsu                                             , name: Nobuo Tobita        , photo: https://thetvdb.plexapp.com/banners/actors/327138.jpg
[ ] role: Sasori                                            , name: Akiko Yajima        , photo: https://thetvdb.plexapp.com/banners/actors/327140.jpg
[ ] role: Kakuzu                                            , name: Takaya Hashi        , photo: https://thetvdb.plexapp.com/banners/actors/327141.jpg
[ ] role: Pain                                              , name: Ken'yû Horiuchi     , photo: https://thetvdb.plexapp.com/banners/actors/327142.jpg
[ ] role: Tobi                                              , name: Wataru Takagi       , photo: https://thetvdb.plexapp.com/banners/actors/327143.jpg
[ ] role: Sai                                               , name: Satoshi Hino        , photo: https://thetvdb.plexapp.com/banners/actors/417559.jpg
[ ] role: Kushina Uzumaki                                   , name: Emi Shinohara       , photo: 
[ ] role: Minato Namikaze / Fourth Hokage                   , name: Toshiyuki Morikawa  , photo: 
[ ] role: Hashirama Senju / First Hokage                    , name: Takayuki Sugō       , photo: 
[ ] role: Chiyo                                             , name: Ikuko Tani          , photo: 
[ ] role: Bee                                               , name: Hisao Egawa         , photo: 
[ ] role: Tobirama Senju / Second Hokage                    , name: Kenyu Horiuchi      , photo: 
[ ] role: Hiruzen-Sarutobi / Third Hokage                   , name: Hidekatsu Shibata   , photo: 
[ ] role: Jūgo                                              , name: Shūhei Sakaguchi    , photo: 
[ ] role: Karin                                             , name: Kanako Tōjō         , photo: 
[ ] role: Suigetsu                                          , name: Takashi Kondō       , photo: 
[ ] role: Kurama / Kyūbi                                    , name: Tesshō Genda        , photo: 
[ ] role: Gyūki / Hachibi                                   , name: Masaki Aizawa       , photo: 
[ ] role: Chōmei / Shichibi                                 , name: Ken'ichi Suzumura   , photo: 
[ ] role: Saiken / Rokubi                                   , name: Miyu Irino          , photo: 
[ ] role: Kokuō / Gobi                                      , name: Mie Sonozaki        , photo: 
[ ] role: Son Gokū / Yonbi                                  , name: Hiroki Yasumoto     , photo: 
[ ] role: Isobu / Sanbi                                     , name: Shigenori Sōya      , photo: 
[ ] role: Matatabi / Nibi                                   , name: Ryōko Shiraishi     , photo: 
[ ] role: Shukaku / Ichibi                                  , name: Hiroshi Iwasaki     , photo: 
[ ] role: Sasori                                            , name: Akiko Yajima        , photo: 
--- episodes ------------------------------------------------------------------------------------------------------------------------------------------------
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=1', Filename: 'TheTVDB/json/79824\episodes_page1_en.json', Age: '948.158107996', Ended: None
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=2', Filename: 'TheTVDB/json/79824\episodes_page2_en.json', Age: '947.416297913', Ended: None
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=3', Filename: 'TheTVDB/json/79824\episodes_page3_en.json', Age: '946.704146385', Ended: None
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=4', Filename: 'TheTVDB/json/79824\episodes_page4_en.json', Age: '946.026149035', Ended: None
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=5', Filename: 'TheTVDB/json/79824\episodes_page5_en.json', Age: '945.399088383', Ended: None
common.LoadFile() - File cached locally - url: 'https://api.thetvdb.com/series/79824/episodes?page=6', Filename: 'TheTVDB/json/79824\episodes_page6_en.json', Age: '945.105936766', Ended: None
[ ]    s0e1 s00e-10 anidbid:         air_date: 2007-08-04
[ ]    s0e2 s00e0-9 anidbid:         air_date: 2008-08-02
[ ]    s0e3 s00e0-8 anidbid:         air_date: 2009-08-01
[ ]    s0e4 s00e0-7 anidbid:         air_date: 2010-07-31
[ ]    s0e5 s00e0-6 anidbid:         air_date: 2008-02-06
[ ]    s0e6 s00e0-5 anidbid:         air_date: 2011-01-01
[ ]    s0e7 s00e0-4 anidbid:         air_date: 2011-07-30
[ ]    s0e8 s00e0-3 anidbid:         air_date: 2010-07-31
[ ]    s0e9 s00e0-2 anidbid:         air_date: 2011-07-30
[ ]   s0e10 s00e0-1 anidbid:         air_date: 2012-07-28
[ ]   s0e11 s00e000 anidbid:         air_date: 2013-10-06
[ ]   s0e12 s00e001 anidbid:         air_date: 2014-12-06
[ ]    s1e1 s00e000 anidbid: xxxxxxx air_date: 2007-02-15
ZeroQI commented 5 years ago

https://github.com/ZeroQI/Hama.bundle/blob/master/Contents/Code/AnimeLists.py line 265-286 Should be [ ] s0e12 s01e001

EndOfLine369 commented 5 years ago

Issue is with anidb_ep() and not tvdb_ep(). Will have to see what is wrong there. ~Probably only related to s0.~ Logic issue is somewhere in this block:

  # <anime anidbid="23" tvdbid="76885" defaulttvdbseason="1" episodeoffset="" tmdbid="" imdbid="">
  defaulttvdbseason = Dict(mappingList, 'defaulttvdbseason')
  episodeoffset     = Dict(mappingList, 'episodeoffset')
  if season==defaulttvdbseason:  return defaulttvdbseason, str(int(episode)-int(episodeoffset)), ''
EndOfLine369 commented 5 years ago

Fixed. Looks like it was broken in 2018 https://github.com/ZeroQI/Hama.bundle/commit/8ee5c151071c73c1c6bad1a7e126ab9345429c1f#diff-d7b7f1f1970112645f6c605242902304R199

ZeroQI commented 5 years ago

Thanks for the fix, you seem to know my code more than i do...

EndOfLine369 commented 5 years ago

😁