Permalink
Browse files

Remove more MAL stuff

  • Loading branch information...
da3dsoul committed Jun 14, 2018
1 parent bf98f3f commit be497ff7712bc31d1fb813a0d9a2297cbf70c08f
@@ -388,7 +388,6 @@
<Compile Include="ViewModel\Server\VM_AniDB_Recommendation.cs" />
<Compile Include="ViewModel\Server\VM_AnimeTitle.cs" />
<Compile Include="ViewModel\Server\VM_CrossRef_AniDB_MAL.cs" />
<Compile Include="ViewModel\Server\VM_CrossRef_AniDB_MAL_Response.cs" />
<Compile Include="ViewModel\Server\VM_DuplicateFile.cs" />
<Compile Include="ViewModel\Server\VM_GroupFileSummary.cs" />
<Compile Include="ViewModel\Server\VM_MovieDBMovieSearch_Response.cs" />
@@ -747,7 +746,6 @@
<Compile Include="Utilities\ExtensionMethods.cs" />
<Compile Include="ViewModel\Server\VM_ImportFolder.cs" />
<Compile Include="ViewModel\VM_ShokoServer.cs" />
<Compile Include="ViewModel\Server\VM_MALAnime_Response.cs" />
<Compile Include="ViewModel\Server\VM_MissingEpisode.cs" />
<Compile Include="ViewModel\Server\VM_MissingFile.cs" />
<Compile Include="ViewModel\Server\VM_MovieDB_Fanart.cs" />
@@ -80,23 +80,6 @@
ToolTip="{usercontrols:Info Title=WebCache_TvDBAssociations, Body=Tooltip_WebCache_TraktAssociations}"/>
</StackPanel>

<!-- MAL Links -->
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="4" Margin="0,5,15,0">
<TextBlock Text="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=WebCache_MALAssociations}" VerticalAlignment="Center"></TextBlock>
</StackPanel>

<StackPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Margin="0,5,5,0">
<CheckBox Name="chkWebCache_MALAssociations_Get" Content="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=Get}"
IsChecked="{Binding Source={x:Static local:VM_ShokoServer.Instance},Path=WebCache_MAL_Get}" VerticalAlignment="Center"
ToolTip="{usercontrols:Info Title=WebCache_MALAssociations, Body=Tooltip_WebCache_MALAssociations}"/>
</StackPanel>

<StackPanel Orientation="Horizontal" Grid.Column="2" Grid.Row="4" Margin="0,5,5,0">
<CheckBox Name="chkWebCache_MALAssociations_Send" Content="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=Send}"
IsChecked="{Binding Source={x:Static local:VM_ShokoServer.Instance},Path=WebCache_MAL_Send}" VerticalAlignment="Center"
ToolTip="{usercontrols:Info Title=WebCache_MALAssociations, Body=Tooltip_WebCache_MALAssociations}"/>
</StackPanel>

<!-- File Episodes -->
<StackPanel Orientation="Horizontal" Grid.Column="0" Grid.Row="5" Margin="0,5,15,0">
<TextBlock Text="{Resx ResxName=Shoko.Commons.Properties.Resources, Key=WebCache_FileEpisodes}" VerticalAlignment="Center"></TextBlock>
@@ -19,8 +19,6 @@ public WebCacheBasicSettings()
chkWebCache_FileEpisodes_Send.Click += new RoutedEventHandler(settingChanged);
chkWebCache_TvDBAssociations_Get.Click += new RoutedEventHandler(settingChanged);
chkWebCache_TvDBAssociations_Send.Click += new RoutedEventHandler(settingChanged);
chkWebCache_MALAssociations_Get.Click += new RoutedEventHandler(settingChanged);
chkWebCache_MALAssociations_Send.Click += new RoutedEventHandler(settingChanged);
chkWebCache_TraktAssociations_Get.Click += new RoutedEventHandler(settingChanged);
chkWebCache_TraktAssociations_Send.Click += new RoutedEventHandler(settingChanged);
chkWebCache_UserInfo.Click += new RoutedEventHandler(settingChanged);

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -190,7 +190,6 @@ public bool SetupClient()
mappings.Add(typeof(CL_BookmarkedAnime), typeof(VM_BookmarkedAnime));
mappings.Add(typeof(CL_CloudAccount), typeof(VM_CloudAccount));
mappings.Add(typeof(CrossRef_AniDB_MAL), typeof(VM_CrossRef_AniDB_MAL));
mappings.Add(typeof(CL_CrossRef_AniDB_MAL_Response), typeof(VM_CrossRef_AniDB_MAL_Response));
mappings.Add(typeof(Azure_CrossRef_AniDB_Trakt), typeof(VM_CrossRef_AniDB_TraktV2));
mappings.Add(typeof(Azure_CrossRef_AniDB_TvDB), typeof(VM_CrossRef_AniDB_TvDBV2));
mappings.Add(typeof(CL_DuplicateFile), typeof(VM_DuplicateFile));
@@ -200,7 +199,6 @@ public bool SetupClient()
mappings.Add(typeof(CL_IgnoreAnime), typeof(VM_IgnoreAnime));
mappings.Add(typeof(ImportFolder), typeof(VM_ImportFolder));
mappings.Add(typeof(JMMUser), typeof(VM_JMMUser));
mappings.Add(typeof(CL_MALAnime_Response), typeof(VM_MALAnime_Response));
mappings.Add(typeof(CL_MissingEpisode), typeof(VM_MissingEpisode));
mappings.Add(typeof(CL_MissingFile), typeof(VM_MissingFile));
mappings.Add(typeof(MovieDB_Fanart), typeof(VM_MovieDB_Fanart));
@@ -347,8 +345,6 @@ public void GetServerSettings()
WebCache_TvDB_Send = contract.WebCache_TvDB_Send;
WebCache_Trakt_Get = contract.WebCache_Trakt_Get;
WebCache_Trakt_Send = contract.WebCache_Trakt_Send;
WebCache_MAL_Get = contract.WebCache_MAL_Get;
WebCache_MAL_Send = contract.WebCache_MAL_Send;
WebCache_XRefFileEpisode_Get = contract.WebCache_XRefFileEpisode_Get;
WebCache_XRefFileEpisode_Send = contract.WebCache_XRefFileEpisode_Send;
WebCache_UserInfo = contract.WebCache_UserInfo;
@@ -399,13 +395,6 @@ public void GetServerSettings()
Trakt_UpdateFrequency = (ScheduledUpdateFrequency)contract.Trakt_UpdateFrequency;
Trakt_SyncFrequency = (ScheduledUpdateFrequency)contract.Trakt_SyncFrequency;

// MAL
MAL_AutoLink = contract.MAL_AutoLink;
MAL_Username = contract.MAL_Username;
MAL_Password = contract.MAL_Password;
MAL_UpdateFrequency = (ScheduledUpdateFrequency)contract.MAL_UpdateFrequency;
MAL_NeverDecreaseWatchedNums = contract.MAL_NeverDecreaseWatchedNums;

Plex_ServerHost = contract.Plex_ServerHost ?? "";
Plex_Sections = string.IsNullOrEmpty(contract.Plex_Sections) ? new ObservableCollection<int>() : new ObservableCollection<int>(contract.Plex_Sections.Split(',').Select(int.Parse).ToList());
}
@@ -471,8 +460,6 @@ private void SaveServerSettings()
contract.WebCache_TvDB_Send = WebCache_TvDB_Send;
contract.WebCache_Trakt_Get = WebCache_Trakt_Get;
contract.WebCache_Trakt_Send = WebCache_Trakt_Send;
contract.WebCache_MAL_Get = WebCache_MAL_Get;
contract.WebCache_MAL_Send = WebCache_MAL_Send;
contract.WebCache_XRefFileEpisode_Get = WebCache_XRefFileEpisode_Get;
contract.WebCache_XRefFileEpisode_Send = WebCache_XRefFileEpisode_Send;
contract.WebCache_UserInfo = WebCache_UserInfo;
@@ -523,13 +510,6 @@ private void SaveServerSettings()
contract.Trakt_UpdateFrequency = (int)Trakt_UpdateFrequency;
contract.Trakt_SyncFrequency = (int)Trakt_SyncFrequency;

// MAL
contract.MAL_AutoLink = MAL_AutoLink;
contract.MAL_Username = MAL_Username;
contract.MAL_Password = MAL_Password;
contract.MAL_UpdateFrequency = (int)MAL_UpdateFrequency;
contract.MAL_NeverDecreaseWatchedNums = MAL_NeverDecreaseWatchedNums;

//plex
contract.Plex_ServerHost = Plex_ServerHost;
contract.Plex_Sections = string.Join(",", Plex_Sections);
@@ -580,24 +560,6 @@ public CL_TraktDeviceCode GetTraktDeviceCode()
return new CL_TraktDeviceCode();
}

public void TestMALLogin()
{
try
{
SaveServerSettings();

string response = ShokoServices.TestMALLogin();
if (string.IsNullOrEmpty(response))
MessageBox.Show(Resources.MAL_LoginCorrect, Resources.Success, MessageBoxButton.OK, MessageBoxImage.Information);
else
MessageBox.Show(response, Resources.Error, MessageBoxButton.OK, MessageBoxImage.Error);
}
catch (Exception ex)
{
Utils.ShowErrorMessage(ex);
}
}

#region Observable Properties

public ObservableCollection<VM_ImportFolder> ImportFolders { get; set; }
@@ -1225,27 +1187,6 @@ public bool WebCache_Trakt_Send
}
}


private bool webCache_MAL_Get;
public bool WebCache_MAL_Get
{
get => webCache_MAL_Get;
set
{
this.SetField(()=>webCache_MAL_Get,value);
}
}

private bool webCache_MAL_Send;
public bool WebCache_MAL_Send
{
get => webCache_MAL_Send;
set
{
this.SetField(()=>webCache_MAL_Send,value);
}
}

private bool webCache_UserInfo;
public bool WebCache_UserInfo
{
@@ -1407,17 +1348,17 @@ public bool AutoGroupSeries
}
}

private bool autoGroupSeriesUseScoreAlgorithm;
public bool AutoGroupSeriesUseScoreAlgorithm
{
get => autoGroupSeriesUseScoreAlgorithm;
set
{
this.SetField(()=>autoGroupSeriesUseScoreAlgorithm,value);
}
}
private bool autoGroupSeriesUseScoreAlgorithm;
public bool AutoGroupSeriesUseScoreAlgorithm
{
get => autoGroupSeriesUseScoreAlgorithm;
set
{
this.SetField(()=>autoGroupSeriesUseScoreAlgorithm,value);
}
}

// The actual server setting
// The actual server setting
private string autoGroupSeriesRelationExclusions = "";
private string AutoGroupSeriesRelationExclusions
{
@@ -1482,17 +1423,17 @@ private void setRelationinExclusion(string setting, bool value)
}
}

public bool RelationAllowDissimilarTitleExclusion
{
get => isRelationInExclusion("AllowDissimilarTitleExclusion");
set => setRelationinExclusion("AllowDissimilarTitleExclusion", value);
}
public bool RelationAllowDissimilarTitleExclusion
{
get => isRelationInExclusion("AllowDissimilarTitleExclusion");
set => setRelationinExclusion("AllowDissimilarTitleExclusion", value);
}

public bool RelationExcludeOVA
public bool RelationExcludeOVA
{
get => isRelationInExclusion("ova");
set => setRelationinExclusion("ova", value);
}
set => setRelationinExclusion("ova", value);
}

public bool RelationExcludeMovie
{
@@ -1736,56 +1677,6 @@ public bool Trakt_DownloadEpisodes
}
}

private bool mal_AutoLink;
public bool MAL_AutoLink
{
get => mal_AutoLink;
set
{
this.SetField(()=>mal_AutoLink,value);
}
}

private string mAL_Username = "";
public string MAL_Username
{
get => mAL_Username;
set
{
this.SetField(()=>mAL_Username,value);
}
}

private string mAL_Password = "";
public string MAL_Password
{
get => mAL_Password;
set
{
this.SetField(()=>mAL_Password,value);
}
}

private ScheduledUpdateFrequency mAL_UpdateFrequency = ScheduledUpdateFrequency.Daily;
public ScheduledUpdateFrequency MAL_UpdateFrequency
{
get => mAL_UpdateFrequency;
set
{
this.SetField(()=>mAL_UpdateFrequency,value);
}
}

private bool mAL_NeverDecreaseWatchedNums;
public bool MAL_NeverDecreaseWatchedNums
{
get => mAL_NeverDecreaseWatchedNums;
set
{
this.SetField(()=>mAL_NeverDecreaseWatchedNums,value);
}
}

private ScheduledUpdateFrequency trakt_UpdateFrequency = ScheduledUpdateFrequency.Daily;
public ScheduledUpdateFrequency Trakt_UpdateFrequency
{

0 comments on commit be497ff

Please sign in to comment.