Skip to content

Commit

Permalink
Renove MAL and make it build maybe
Browse files Browse the repository at this point in the history
  • Loading branch information
@da3dsoul
da3dsoul committed Jun 14, 2018
1 parent 132aeb6 commit a7a91c8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 103 deletions.
2 changes: 1 addition & 1 deletion Shoko.Commons
Submodule Shoko.Commons updated from 74681e to 7f4f7c
6 changes: 1 addition & 5 deletions Shoko.MyAnime3/Extensions/ModelExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,6 @@ public static string GetOnlineImagePath(this Trakt_Episode traktEpisodeVm)
return traktEpisodeVm.EpisodeImage;
}
*/
public static string GetOverview(this CL_MALAnime_Response malSearchResultVm)
{
return Utils.ReparseDescription(malSearchResultVm.synopsis);
}

public static string GetPrettyDescription(this CL_GroupVideoQuality CL_GroupVideoQuality)
{
Expand Down Expand Up @@ -231,4 +227,4 @@ public static string GetDescription(this ImportFolder ImportFolder)
return desc;
}
}
}
}
109 changes: 12 additions & 97 deletions Shoko.MyAnime3/Windows/MainWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ public string GetPropertyName(GuiProperty which)

private static string StaticGetPropertyName(string which)
{
return SkinExtensions.BaseProperties + "." + which.Replace("_", ".").Replace("ñ", "_");
return SkinExtensions.BaseProperties + "." + which.Replace("_", ".").Replace("ñ", "_");
}

public static void StaticSetGUIProperty(GuiProperty which, string value)
Expand Down Expand Up @@ -3198,15 +3198,15 @@ private void Group_OnItemSelectedDisplay()
string rating = Utils.FormatAniDBRating((double) AniDBRating) + " (" + totalVotes + " " + Translation.Votes + ")";
SetGUIProperty(GuiProperty.SeriesGroup_RawRating, Utils.FormatAniDBRating((double) AniDBRating));
SetGUIProperty(GuiProperty.SeriesGroup_RatingVoteCount, totalVotes.ToString(Globals.Culture));
SetGUIProperty(GuiProperty.SeriesGroup_Rating, rating);

// Image Rankings
if (dummyStarOnPlaceholder != null && dummyStarOffPlaceholder != null)
{
string im = Logos.buildRating((double)AniDBRating, dummyStarOffPlaceholder.FileName,
dummyStarOnPlaceholder.FileName,
dummyStarOnPlaceholder.Width, dummyStarOnPlaceholder.Height);
SetGUIProperty(GuiProperty.RatingImage, im);
SetGUIProperty(GuiProperty.SeriesGroup_Rating, rating);

// Image Rankings
if (dummyStarOnPlaceholder != null && dummyStarOffPlaceholder != null)
{
string im = Logos.buildRating((double)AniDBRating, dummyStarOffPlaceholder.FileName,
dummyStarOnPlaceholder.FileName,
dummyStarOnPlaceholder.Width, dummyStarOnPlaceholder.Height);
SetGUIProperty(GuiProperty.RatingImage, im);
}


Expand Down Expand Up @@ -3780,19 +3780,6 @@ private void LinkAniDBToMovieDB(VM_AnimeSeries_User ser, int animeID, int movieI
ShokoServerHelper.GetSeries(ser.AnimeSeriesID);
}

private void LinkAniDBToMAL(VM_AnimeSeries_User ser, int animeID, int malID, string malTitle)
{
if (ser.CrossRefAniDBMAL != null)
foreach (CrossRef_AniDB_MAL xref in ser.CrossRefAniDBMAL)
VM_ShokoServer.Instance.ShokoServices.RemoveLinkAniDBMAL(xref.AnimeID, malID, xref.StartEpisodeType, xref.StartEpisodeNumber);

string res = VM_ShokoServer.Instance.ShokoServices.LinkAniDBMAL(animeID, malID, malTitle, 1, 1);
if (res.Length > 0)
Utils.DialogMsg(Translation.Error, res);

ShokoServerHelper.GetSeries(ser.AnimeSeriesID);
}

private ContextMenuAction SearchTheMovieDBMenu(VM_AnimeSeries_User ser, string previousMenu)
{
int aniDBID = ser.Anime.AnimeID;
Expand Down Expand Up @@ -3837,48 +3824,6 @@ private ContextMenuAction SearchTheMovieDB(VM_AnimeSeries_User ser, string searc
return ContextMenuAction.Exit;
}

private ContextMenuAction SearchMALMenu(VM_AnimeSeries_User ser, string previousMenu)
{


ContextMenu cmenu = new ContextMenu(Translation.SearchMAL, previousmenu: previousMenu);
cmenu.Add(Translation.SearchUsing + ": " + ser.Anime.FormattedTitle, () => SearchMAL(ser, ser.Anime.FormattedTitle, Translation.SearchMAL));
cmenu.Add(Translation.ManualSearch, () =>
{
searchText = ser.Anime.FormattedTitle;
if (Utils.DialogText(ref searchText, GetID))
return SearchMAL(ser, searchText, Translation.SearchMAL);
return ContextMenuAction.Continue;
});
return cmenu.Show();
}

private ContextMenuAction SearchMAL(VM_AnimeSeries_User ser, string searchCriteria, string previousMenu)
{
if (searchCriteria.Length == 0)
return ContextMenuAction.Exit;

int aniDbid = ser.Anime.AnimeID;

List<CL_MALAnime_Response> malSearchResults = VM_ShokoServer.Instance.ShokoServices.SearchMAL(searchCriteria.Trim());


BaseConfig.MyAnimeLog.Write("Found {0} MAL results for {1}", malSearchResults.Count, searchCriteria);

if (malSearchResults.Count > 0)
{
ContextMenu cmenu = new ContextMenu(Translation.SearchResults, previousmenu: previousMenu);
foreach (CL_MALAnime_Response res in malSearchResults)
{
CL_MALAnime_Response local = res;
cmenu.AddAction(String.Format("{0} ({1} {2})", res.title, res.episodes, Translation.EpisodesShort), () => LinkAniDBToMAL(ser, aniDbid, local.id, local.title));
}
return cmenu.Show();
}
this.Alert(Translation.SearchResults, string.Empty, Translation.NoResultsFound);
return ContextMenuAction.Exit;
}

private void ReplaceSerie(int id, VM_AnimeSeries_User ser)
{
for (int x = 0; x < Breadcrumbs.Count; x++)
Expand Down Expand Up @@ -3977,7 +3922,7 @@ private ContextMenuAction ShowContextMenuEpisode(string previousMenu)
BaseConfig.MyAnimeLog.Write("Error during watch state change - series was null!");
ser = episode.AnimeSeries;
}
else
else
{
VM_ShokoServer.Instance.ShokoServices.SetWatchedStatusOnSeries(ser.AnimeSeriesID, false,
episode.EpisodeNumber - 1, (int) ept, VM_ShokoServer.Instance.CurrentUser.JMMUserID);
Expand Down Expand Up @@ -4078,35 +4023,27 @@ private ContextMenuAction ShowContextMenuDatabases(VM_AnimeSeries_User ser, stri

bool hasTvDbLink = ser.CrossRefAniDBTvDBV2.Count > 0 && ser.Anime.AniDB_AnimeCrossRefs != null && ser.Anime.AniDB_AnimeCrossRefs.TvDBCrossRefExists;
bool hasMovieDbLink = ser.CrossRefAniDBMovieDB != null && ser.Anime.AniDB_AnimeCrossRefs != null && ser.Anime.AniDB_AnimeCrossRefs.MovieDBMovie != null;
bool hasMalLink = ser.CrossRefAniDBMAL != null && ser.CrossRefAniDBMAL.Count > 0;

ContextMenu cmenu = new ContextMenu(currentMenu, previousmenu: previousMenu);

string tvdbText = Translation.SearchTheTvDB;
string moviedbText = Translation.SearchTheMovieDB;
string malText = Translation.SearchMAL;

if (hasTvDbLink && ser.Anime.AniDB_AnimeCrossRefs != null)
tvdbText += string.Format(" ({0}: {1})", Translation.Current, ser.Anime.AniDB_AnimeCrossRefs.TvDBSeries[0].SeriesName);

if (hasMovieDbLink && ser.Anime.AniDB_AnimeCrossRefs != null)
moviedbText += string.Format(" ({0}: {1})", Translation.Current, ser.Anime.AniDB_AnimeCrossRefs.MovieDBMovie.MovieName);

if (hasMalLink)
malText += string.Format(" ({0}: {1})", Translation.Current, ser.CrossRefAniDBMAL.Count == 1 ? ser.CrossRefAniDBMAL[0].MALTitle : Translation.MultipleLinks);

if (!hasMovieDbLink)
{
cmenu.Add(tvdbText, () => SearchTheTvDBMenu(ser, currentMenu));
cmenu.Add(malText, () => SearchMALMenu(ser, currentMenu));
}

if (!hasTvDbLink)
cmenu.Add(moviedbText, () => SearchTheMovieDBMenu(ser, currentMenu));
if (hasTvDbLink)
cmenu.Add(Translation.TheTVDB + " ...", () => ShowContextMenuTVDB(ser, currentMenu));
if (hasMalLink)
cmenu.Add(Translation.MAL + " ...", () => ShowContextMenuMAL(ser, currentMenu));
if (hasMovieDbLink)
cmenu.Add(Translation.TheMovieDB + " ...", () => ShowContextMenuMovieDB(ser, currentMenu));
return cmenu.Show();
Expand Down Expand Up @@ -4574,28 +4511,6 @@ private ContextMenuAction ShowContextMenuMovieDB(VM_AnimeSeries_User ser, string
return cmenu.Show();
}

private ContextMenuAction ShowContextMenuMAL(VM_AnimeSeries_User ser, string previousMenu)
{
GUIListItem currentitem = m_Facade.SelectedListItem;
if (currentitem == null)
return ContextMenuAction.Exit;
string displayName;

if (ser.CrossRefAniDBMAL != null && ser.CrossRefAniDBMAL.Count > 0)
displayName = ser.CrossRefAniDBMAL.Count == 1
? ser.CrossRefAniDBMAL[0].MALTitle
: Translation.MultipleLinks;
else
return ContextMenuAction.PreviousMenu;
ContextMenu cmenu = new ContextMenu(displayName, previousmenu: previousMenu);
cmenu.AddAction(Translation.RemoveMALAssociation, () =>
{
foreach (CrossRef_AniDB_MAL xref in ser.CrossRefAniDBMAL)
VM_ShokoServer.Instance.ShokoServices.RemoveLinkAniDBMAL(xref.AnimeID, xref.MALID, xref.StartEpisodeType, xref.StartEpisodeNumber);
});
return cmenu.Show();
}

private ContextMenuAction ShowSeasonSelectionMenuTvDB(VM_AnimeSeries_User ser, int animeID, int tvdbid, string previousMenu)
{
try
Expand Down Expand Up @@ -4903,4 +4818,4 @@ class BackgroundFacadeLoadingArgument
public object Argument;
public int IndexArgument;
}
}
}

0 comments on commit a7a91c8

Please sign in to comment.