Skip to content

Commit

Permalink
Fixes: Issue #1 and Issue #2
Browse files Browse the repository at this point in the history
  • Loading branch information
@spektor56
spektor56 committed Feb 23, 2020
1 parent 9983812 commit 739b913
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 75 deletions.
25 changes: 25 additions & 0 deletions RAWGMetadata/Model/GameOption.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
using Playnite.SDK;
using Rawg.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace RAWGMetadata.Model
{
public class GameOption : GenericItemOption
{
public Game Game { get; private set; }

public GameOption(Game game)
{
this.Game = game;
this.Description = game.Slug;
this.Name = game.Name;
}



}
}
3 changes: 2 additions & 1 deletion RAWGMetadata/RAWGMetadata.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\AppData\Local\Playnite\Extensions\RAWGMetadata\</OutputPath>
<OutputPath>..\..\..\..\AppData\Local\Playnite\Extensions\RawgMetadata\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
Expand Down Expand Up @@ -62,6 +62,7 @@
<Generator>MSBuild:Compile</Generator>
</Page>
<Compile Include="Extensions\StringExtensions.cs" />
<Compile Include="Model\GameOption.cs" />
<Compile Include="RawgLazyMetadataProvider.cs" />
<Compile Include="RawgMetadataPlugin.cs" />
<Compile Include="RawgMetadataSettings.cs" />
Expand Down
163 changes: 90 additions & 73 deletions RAWGMetadata/RawgLazyMetadataProvider.cs
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using Playnite.SDK.Metadata;
using Playnite.SDK;
using Playnite.SDK.Metadata;
using Playnite.SDK.Models;
using Playnite.SDK.Plugins;
using Rawg.Api;
using RAWGMetadata.Extensions;
using RAWGMetadata.Model;
using System;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -32,22 +34,20 @@ public RawgLazyMetadataProvider(ulong gameId, RawgMetadataPlugin plugin)
this.plugin = plugin;
}

private Rawg.Model.GameSingle GetGameInfo()
private void GetGameInfo()
{
var game = GetGame();

if (!(game is null) && _gameInfo is null)
{
_gameInfo = _gamesApi.GamesRead(game.Id.ToString());
return _gameInfo;
}
else

if (_gameInfo is null)
{
return _gameInfo;
GetGame();
if (!(_game is null))
{
_gameInfo = _gamesApi.GamesRead(_game.Id.ToString());
}
}
}

private Rawg.Model.Game GetGame()
private void GetGame()
{
if (_game is null && !initialized)
{
Expand All @@ -67,29 +67,42 @@ private Rawg.Model.Game GetGame()

var gameList = _gamesApi.GamesList(null, null, options.GameData.Name, null, platformId);
_game = gameList.Results.FirstOrDefault(game => game.Name.Sanitize().Equals(options.GameData.Name.Sanitize()));
/*
if (_game == null)

if (_game == null && !options.IsBackgroundDownload)
{
_game = gameList.Results.FirstOrDefault();
var selectedGame = plugin.PlayniteApi.Dialogs.ChooseItemWithSearch(new List<GenericItemOption>(gameList.Results.Select(_game => new GameOption(_game))), (a) =>
{
try
{
return new List<GenericItemOption>(_gamesApi.GamesList(null, null, a, null, platformId).Results.Select(_game => new GameOption(_game)));
}
catch (Exception e)
{
return new List<GenericItemOption>();
}
}, options.GameData.Name, string.Empty);

if (selectedGame == null)
{
_game = null;
}
else
{
_game = ((GameOption)selectedGame).Game;
}
}
*/
return _game;
}
else
{
return _game;
}
}

public override string GetName()
{
var game = GetGame();
GetGame();

if (game != null)
if (_game != null)
{
if (!string.IsNullOrWhiteSpace(game.Name))
if (!string.IsNullOrWhiteSpace(_game.Name))
{
return game.Name;
return _game.Name;
}
}

Expand All @@ -98,13 +111,13 @@ public override string GetName()

public override List<string> GetGenres()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
if (gameInfo.Genres != null)
if (_gameInfo.Genres != null)
{
return gameInfo.Genres.Select(genre => genre.Name).ToList();
return _gameInfo.Genres.Select(genre => genre.Name).ToList();
}
}

Expand All @@ -114,13 +127,13 @@ public override List<string> GetGenres()

public override DateTime? GetReleaseDate()
{
var game = GetGame();
GetGame();

if (game != null)
if (_game != null)
{
if (game.Released != null)
if (_game.Released != null)
{
return game.Released;
return _game.Released;
}
}

Expand All @@ -129,13 +142,13 @@ public override List<string> GetGenres()

public override List<string> GetDevelopers()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
if (gameInfo.Developers != null)
if (_gameInfo.Developers != null)
{
return gameInfo.Developers.Select(developer => developer.Name).ToList();
return _gameInfo.Developers.Select(developer => developer.Name).ToList();
}
}

Expand All @@ -144,13 +157,13 @@ public override List<string> GetDevelopers()

public override List<string> GetPublishers()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
if (gameInfo.Publishers != null)
if (_gameInfo.Publishers != null)
{
return gameInfo.Publishers.Select(publisher => publisher.Name).ToList();
return _gameInfo.Publishers.Select(publisher => publisher.Name).ToList();
}
}

Expand All @@ -160,13 +173,13 @@ public override List<string> GetPublishers()

public override string GetDescription()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
if (!string.IsNullOrWhiteSpace(gameInfo.Description))
if (!string.IsNullOrWhiteSpace(_gameInfo.Description))
{
return gameInfo.Description;
return _gameInfo.Description;
}
}

Expand All @@ -175,13 +188,13 @@ public override string GetDescription()

public override int? GetCommunityScore()
{
var game = GetGame();
GetGame();

if (game != null)
if (_game != null)
{
if (game.Rating != null)
if (_game.Rating != null)
{
return (int)(game.Rating*20);
return (int)(_game.Rating*20);
}
}

Expand All @@ -191,13 +204,13 @@ public override string GetDescription()
public override MetadataFile GetCoverImage()
{
/*
var game = GetGame();
GetGame();
if (game != null)
if (_game != null)
{
if (!string.IsNullOrWhiteSpace(game.BackgroundImage))
if (!string.IsNullOrWhiteSpace(_game.BackgroundImage))
{
return new MetadataFile(game.BackgroundImage);
return new MetadataFile(_game.BackgroundImage);
}
}
*/
Expand All @@ -206,13 +219,13 @@ public override MetadataFile GetCoverImage()

public override MetadataFile GetBackgroundImage()
{
var game = GetGame();
GetGame();

if (game != null)
if (_game != null)
{
if (!string.IsNullOrWhiteSpace(game.BackgroundImage))
if (!string.IsNullOrWhiteSpace(_game.BackgroundImage))
{
return new MetadataFile(game.BackgroundImage);
return new MetadataFile(_game.BackgroundImage);
}
}

Expand All @@ -221,25 +234,25 @@ public override MetadataFile GetBackgroundImage()

public override List<Link> GetLinks()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
var links = new List<Link>();

if (!string.IsNullOrWhiteSpace(gameInfo.Website))
if (!string.IsNullOrWhiteSpace(_gameInfo.Website))
{
links.Add(new Link("Website", gameInfo.Website));
links.Add(new Link("Website", _gameInfo.Website));
}

if (!string.IsNullOrWhiteSpace(gameInfo.MetacriticUrl))
if (!string.IsNullOrWhiteSpace(_gameInfo.MetacriticUrl))
{
links.Add(new Link("Metacritic", gameInfo.MetacriticUrl));
links.Add(new Link("Metacritic", _gameInfo.MetacriticUrl));
}

if (!string.IsNullOrWhiteSpace(gameInfo.RedditUrl))
if (!string.IsNullOrWhiteSpace(_gameInfo.RedditUrl))
{
links.Add(new Link("Reddit", gameInfo.RedditUrl));
links.Add(new Link("Reddit", _gameInfo.RedditUrl));
}

if (links.Count > 0)
Expand All @@ -253,22 +266,26 @@ public override List<Link> GetLinks()

public override MetadataFile GetIcon()
{
/*
using (MemoryStream ms = new MemoryStream())
{
RAWGMetadata.Properties.Resources.rawg.Save(ms);
return new MetadataFile("RAWG", ms.ToArray());
}
*/

return base.GetIcon();
}

public override int? GetCriticScore()
{
var game = GetGame();
GetGame();

if (game != null)
if (_game != null)
{
if (game.Metacritic != null)
if (_game.Metacritic != null)
{
return game.Metacritic;
return _game.Metacritic;
}
}

Expand All @@ -277,13 +294,13 @@ public override MetadataFile GetIcon()

public override List<string> GetTags()
{
var gameInfo = GetGameInfo();
GetGameInfo();

if (gameInfo != null)
if (_gameInfo != null)
{
if (gameInfo.Tags != null)
if (_gameInfo.Tags != null)
{
return gameInfo.Tags.Select(tag => tag.Name).ToList();
return _gameInfo.Tags.Select(tag => tag.Name).ToList();
}
}

Expand Down
2 changes: 1 addition & 1 deletion RAWGMetadata/RawgMetadataPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public override OnDemandMetadataProvider GetMetadataProvider(MetadataRequestOpti
MetadataField.Links,
MetadataField.CriticScore,
MetadataField.CommunityScore,
MetadataField.Icon,
//MetadataField.Icon,
//MetadataField.CoverImage,
MetadataField.BackgroundImage

Expand Down

0 comments on commit 739b913

Please sign in to comment.