Merge branch 'anilist' into develop

erengy · Dec 8, 2017 · 222bb9a · 222bb9a
2 parents bc1abf4 + aff47f3
commit 222bb9a
Show file tree

Hide file tree

Showing 35 changed files with 1,549 additions and 294 deletions.
diff --git a/project/vs2017/Taiga.vcxproj b/project/vs2017/Taiga.vcxproj
@@ -217,6 +217,8 @@
     <ClCompile Include="..\..\src\library\metadata.cpp" />
     <ClCompile Include="..\..\src\library\resource.cpp" />
     <ClCompile Include="..\..\src\main.cpp" />
+    <ClCompile Include="..\..\src\sync\anilist.cpp" />
+    <ClCompile Include="..\..\src\sync\anilist_util.cpp" />
     <ClCompile Include="..\..\src\sync\kitsu.cpp" />
     <ClCompile Include="..\..\src\sync\kitsu_util.cpp" />
     <ClCompile Include="..\..\src\sync\manager.cpp" />
@@ -382,6 +384,9 @@
     <ClInclude Include="..\..\src\library\history.h" />
     <ClInclude Include="..\..\src\library\metadata.h" />
     <ClInclude Include="..\..\src\library\resource.h" />
+    <ClInclude Include="..\..\src\sync\anilist.h" />
+    <ClInclude Include="..\..\src\sync\anilist_types.h" />
+    <ClInclude Include="..\..\src\sync\anilist_util.h" />
     <ClInclude Include="..\..\src\sync\kitsu.h" />
     <ClInclude Include="..\..\src\sync\kitsu_types.h" />
     <ClInclude Include="..\..\src\sync\kitsu_util.h" />

diff --git a/project/vs2017/Taiga.vcxproj.filters b/project/vs2017/Taiga.vcxproj.filters
@@ -73,6 +73,9 @@
     <Filter Include="library\anime">
       <UniqueIdentifier>{d6043b6b-33fb-470e-bab4-28380104489e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="sync\anilist">
+      <UniqueIdentifier>{b390951c-cbaf-4d02-871d-563957f7080e}</UniqueIdentifier>
+    </Filter>
     <Filter Include="sync\kitsu">
       <UniqueIdentifier>{4eb462d7-7759-463c-99cf-e34daf381970}</UniqueIdentifier>
     </Filter>
@@ -424,6 +427,12 @@
     <ClCompile Include="..\..\src\sync\sync.cpp">
       <Filter>sync</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\sync\anilist.cpp">
+      <Filter>sync\anilist</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\sync\anilist_util.cpp">
+      <Filter>sync\anilist</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\src\sync\kitsu.cpp">
       <Filter>sync\kitsu</Filter>
     </ClCompile>
@@ -915,6 +924,15 @@
     <ClInclude Include="..\..\src\sync\sync.h">
       <Filter>sync</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\sync\anilist.h">
+      <Filter>sync\anilist</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sync\anilist_types.h">
+      <Filter>sync\anilist</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\sync\anilist_util.h">
+      <Filter>sync\anilist</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\src\sync\kitsu.h">
       <Filter>sync\kitsu</Filter>
     </ClInclude>

diff --git a/res/menu.xml b/res/menu.xml
@@ -24,9 +24,15 @@
 	<menu name="Services">
 		<item name="Synchronize list&#9;Ctrl+S" action="Synchronize()"/>
 		<item type="separator"/>
+		<item name="AniList" sub="AniList"/>
 		<item name="Kitsu" sub="Kitsu"/>
 		<item name="MyAnimeList" sub="MyAnimeList"/>
 	</menu>
+	<!-- AniList -->
+	<menu name="AniList">
+		<item name="Go to my profile" action="AniListViewProfile()"/>
+		<item name="Go to my stats"   action="AniListViewStats()"/>
+	</menu>
 	<!-- Kitsu -->
 	<menu name="Kitsu">
 		<item name="Go to my feed"    action="KitsuViewFeed()"/>

diff --git a/src/library/anime_util.cpp b/src/library/anime_util.cpp
@@ -29,6 +29,7 @@
 #include "library/anime_episode.h"
 #include "library/anime_util.h"
 #include "library/history.h"
+#include "sync/anilist_util.h"
 #include "sync/kitsu_util.h"
 #include "sync/myanimelist_util.h"
 #include "sync/sync.h"
@@ -965,7 +966,10 @@ std::wstring TranslateMyScore(int value, const std::wstring& default_char) {
       return sync::myanimelist::TranslateMyRating(value, false);
     case sync::kKitsu:
       return sync::kitsu::TranslateMyRating(
-          value, sync::kitsu::GetCurrentRatingSystem());
+          value, sync::kitsu::GetRatingSystem());
+    case sync::kAniList:
+      return sync::anilist::TranslateMyRating(
+          value, sync::anilist::GetRatingSystem());
   }
 }
 
@@ -977,7 +981,10 @@ std::wstring TranslateMyScoreFull(int value) {
       return sync::myanimelist::TranslateMyRating(value, true);
     case sync::kKitsu:
       return sync::kitsu::TranslateMyRating(
-          value, sync::kitsu::GetCurrentRatingSystem());
+          value, sync::kitsu::GetRatingSystem());
+    case sync::kAniList:
+      return sync::anilist::TranslateMyRating(
+          value, sync::anilist::GetRatingSystem());
   }
 }
 
@@ -986,9 +993,10 @@ std::wstring TranslateScore(double value) {
     default:
     case sync::kMyAnimeList:
       return ToWstr(value, 2);
-
     case sync::kKitsu:
       return ToWstr(sync::kitsu::TranslateSeriesRatingTo(value), 2) + L"%";
+    case sync::kAniList:
+      return ToWstr(sync::anilist::TranslateSeriesRatingTo(value), 0) + L"%";
   }
 }