Rawr

Goldenfreddy0703 · Nov 28, 2024 · 3023b46 · 3023b46
1 parent 62715d8
commit 3023b46
Show file tree

Hide file tree

Showing 12 changed files with 147 additions and 12 deletions.
diff --git a/repo/plugin.video.otaku.testing/addon.xml b/repo/plugin.video.otaku.testing/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.24">
+<addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.25">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.beautifulsoup4"/>

diff --git a/repo/plugin.video.otaku.testing/changelog.txt b/repo/plugin.video.otaku.testing/changelog.txt
@@ -1,3 +1,8 @@
+Changelog v5.1.25 (2024-11-28):
+- Improved Airing Calendar for Mal
+- Fix Small Bug with smartscroll
+- Added Simkl Ranks to Mal Calendar
+
 Changelog v5.1.24 (2024-11-27):
 - Added Airing Anime Calendar
 

diff --git a/repo/plugin.video.otaku.testing/resources/images/anichart-icon-simkl.png b/repo/plugin.video.otaku.testing/resources/images/anichart-icon-simkl.png
diff --git a/repo/plugin.video.otaku.testing/resources/lib/AniListBrowser.py b/repo/plugin.video.otaku.testing/resources/lib/AniListBrowser.py
@@ -87,7 +87,7 @@ def get_season_year(self, period='current'):
         return season, year
 
 
-    def get_airing_calendar(self, page=1, format_in=''):
+    def get_airing_calendar(self, page=1):
         import datetime
         import time
         import itertools
@@ -116,7 +116,7 @@ def get_airing_calendar(self, page=1, format_in=''):
 
         results = list(map(self.process_airing_view, list_))
         results = list(itertools.chain(*results))
-        airing = database.get(lambda x, y: results, 12, page, self.format_in_type)
+        airing = database.get(lambda x: results, 24, page)
         return airing
 
 

diff --git a/repo/plugin.video.otaku.testing/resources/lib/MalBrowser.py b/repo/plugin.video.otaku.testing/resources/lib/MalBrowser.py
@@ -161,7 +161,7 @@ def get_season_year(self, period='current'):
                 season_start_date_last, season_end_date_last, year_start_date_last, year_end_date_last,
                 season_start_date_next, season_end_date_next, year_start_date_next, year_end_date_next)
 
-    def get_airing_calendar(self, page=1, format_in=''):
+    def get_airing_calendar(self, page=1):
         import time
 
         days_of_week = ['monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday', 'sunday']
@@ -1548,7 +1548,7 @@ def base_airing_view(self, res, ts):
         airingAt_day = airingAt.strftime('%A')
         airingAt_time = airingAt.strftime('%I:%M %p')
         airing_status = 'airing' if airingAt.timestamp() > ts else 'aired'
-        rank = None
+        simkl_rank = None
         genres = [genre['name'] for genre in res['genres']]
         if genres:
             genres = ' | '.join(genres[:3])
@@ -1563,6 +1563,7 @@ def base_airing_view(self, res, ts):
         if simkl_entry:
             episode = simkl_entry['episode']['episode']
             rating = simkl_entry['ratings']['simkl']['rating']
+            simkl_rank = simkl_entry['rank']
             airingAt = datetime.datetime.fromisoformat(simkl_entry['date'].replace('Z', '+00:00'))
             airingAt_day = airingAt.strftime('%A')
             airingAt_time = airingAt.strftime('%I:%M %p')
@@ -1578,8 +1579,8 @@ def base_airing_view(self, res, ts):
             'poster': res['images']['jpg']['image_url'],
             'ep_title': '{} {} {}'.format(episode, airing_status, airingAt_day),
             'ep_airingAt': airingAt_time,
-            'averageScore': score,
-            'rank': rank,
+            'rating': score,
+            'simkl_rank': simkl_rank,
             'plot': res['synopsis'].replace('<br><br>', '[CR]').replace('<br>', '').replace('<i>', '[I]').replace('</i>', '[/I]') if res['synopsis'] else res['synopsis'],
             'genres': genres,
             'id': res['mal_id']

diff --git a/repo/plugin.video.otaku.testing/resources/lib/ui/control.py b/repo/plugin.video.otaku.testing/resources/lib/ui/control.py
@@ -374,10 +374,8 @@ def draw_items(video_data, content_type=None, draw_cm=None):
             for _ in range(num_watched):
                 if getInt('smart.scroll.direction') == 0:
                     xbmc.executebuiltin('Action(Down)')
-                    print('down')
                 else:
                     xbmc.executebuiltin('Action(Right)')
-                    print('right')
 
 
 def bulk_player_list(video_data, draw_cm=None, bulk_add=True):

diff --git a/repo/plugin.video.otaku.testing/resources/lib/windows/anichart_window.py b/repo/plugin.video.otaku.testing/resources/lib/windows/anichart_window.py
@@ -19,6 +19,7 @@ def __init__(self, xml_file, location, actionArgs=None):
         self.setProperty('texture.averstr', os.path.join(control.IMAGES_PATH, 'anichart-icon-null.png'))
         self.setProperty('texture.aversad', os.path.join(control.IMAGES_PATH, 'anichart-icon-frown.png'))
         self.setProperty('texture.popular', os.path.join(control.IMAGES_PATH, 'anichart-icon-popular.png'))
+        self.setProperty('texture.simkl_rank', os.path.join(control.IMAGES_PATH, 'anichart-icon-simkl.png'))
         self.setProperty('otaku.logo', control.OTAKU_LOGO3_PATH)
         self.setProperty('otaku.fanart', control.OTAKU_FANART)
         self.setProperty('settings.color', 'deepskyblue')

diff --git a/repo/plugin.video.otaku.testing/resources/skins/Default/1080i/anichart.xml b/repo/plugin.video.otaku.testing/resources/skins/Default/1080i/anichart.xml
@@ -200,6 +200,71 @@
               <align>left</align>
               <label>#$INFO[ListItem.Property(rank)]</label>
             </control>
+
+            <control type="group">
+              <left>750</left>
+              <top>10</top>
+              <control type="label">
+                <visible>Integer.IsGreater(ListItem.Property(rating),0)</visible>
+                <left>-110</left>
+                <top>0</top>
+                <width>100</width>
+                <height>22</height>
+                <font>font12</font>
+                <selectedcolor>white</selectedcolor>
+                <align>right</align>
+                <label>$INFO[ListItem.Property(rating)]%</label>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreaterOrEqual(ListItem.Property(rating),75)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.aver)]</texture>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(rating),60) + Integer.IsLess(ListItem.Property(rating),75)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.averstr)]</texture>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(rating),0) + Integer.IsLessOrEqual(ListItem.Property(rating),60)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.aversad)]</texture>
+              </control>
+            </control>
+
+            <control type="group">
+              <left>750</left>
+              <top>60</top>
+              <control type="label">
+                <visible>Integer.IsGreater(ListItem.Property(simkl_rank),0)</visible>
+                <left>-110</left>
+                <top>0</top>
+                <width>100</width>
+                <height>22</height>
+                <font>font12</font>
+                <selectedcolor>white</selectedcolor>
+                <align>right</align>
+                <label>#$INFO[ListItem.Property(simkl_rank)]</label>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(simkl_rank),0)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.simkl_rank)]</texture>
+              </control>
+            </control>
+
         	</itemlayout>
         	<focusedlayout height="390" width="800">
             <control type="image">
@@ -339,6 +404,71 @@
               <align>left</align>
               <label>#$INFO[ListItem.Property(rank)]</label>
             </control>
+
+            <control type="group">
+              <left>750</left>
+              <top>10</top>
+              <control type="label">
+                <visible>Integer.IsGreater(ListItem.Property(rating),0)</visible>
+                <left>-110</left>
+                <top>0</top>
+                <width>100</width>
+                <height>22</height>
+                <font>font12</font>
+                <selectedcolor>white</selectedcolor>
+                <align>right</align>
+                <label>$INFO[ListItem.Property(rating)]%</label>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreaterOrEqual(ListItem.Property(rating),75)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.aver)]</texture>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(rating),60) + Integer.IsLess(ListItem.Property(rating),75)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.averstr)]</texture>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(rating),0) + Integer.IsLessOrEqual(ListItem.Property(rating),60)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.aversad)]</texture>
+              </control>
+            </control>
+
+            <control type="group">
+              <left>750</left>
+              <top>60</top>
+              <control type="label">
+                <visible>Integer.IsGreater(ListItem.Property(simkl_rank),0)</visible>
+                <left>-110</left>
+                <top>0</top>
+                <width>100</width>
+                <height>22</height>
+                <font>font12</font>
+                <selectedcolor>white</selectedcolor>
+                <align>right</align>
+                <label>#$INFO[ListItem.Property(simkl_rank)]</label>
+              </control>
+              <control type="image">
+                <visible>Integer.IsGreater(ListItem.Property(simkl_rank),0)</visible>
+                <left>0</left>
+                <top>0</top>
+                <width>35</width>
+                <height>35</height>
+                <texture>$INFO[Window().Property(texture.simkl_rank)]</texture>
+              </control>
+            </control>
+
         	</focusedlayout>
         </control>
 

diff --git a/repo/zips/addons.xml b/repo/zips/addons.xml
@@ -65,7 +65,7 @@
       <poster>poster.png</poster>
     </assets>
   </extension>
-</addon><addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.24">
+</addon><addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.25">
   <requires>
     <import addon="xbmc.python" version="3.0.0" />
     <import addon="script.module.beautifulsoup4" />

diff --git a/repo/zips/addons.xml.md5 b/repo/zips/addons.xml.md5
@@ -1 +1 @@
-09849429bee7e7eedb9d858bbe21197f
+0bd728c846bbf4ebc57da56651d01d3b
diff --git a/repo/zips/plugin.video.otaku.testing/addon.xml b/repo/zips/plugin.video.otaku.testing/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.24">
+<addon id="plugin.video.otaku.testing" name="Otaku Testing" provider-name="TeamOtaku" version="5.1.25">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
     <import addon="script.module.beautifulsoup4"/>

diff --git a/repo/zips/plugin.video.otaku.testing/plugin.video.otaku.testing-5.1.25.zip b/repo/zips/plugin.video.otaku.testing/plugin.video.otaku.testing-5.1.25.zip
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		09849429bee7e7eedb9d858bbe21197f
		0bd728c846bbf4ebc57da56651d01d3b