Bug fix and remove adjust core

2dust · Jan 1, 2024 · 141943d · 141943d
1 parent ba36b62
commit 141943d
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 125 deletions.
diff --git a/clashN/clashN/Global.cs b/clashN/clashN/Global.cs
@@ -105,7 +105,7 @@ internal class Global
  ""
  };
 
- public static readonly List<string> coreTypes = new List<string> { "Clash", "ClashPremium", "ClashMeta", };
+ public static readonly List<string> coreTypes = new List<string> { "Clash", "ClashPremium", "ClashMeta", "Mihomo" };
 
  public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
 

diff --git a/clashN/clashN/Handler/ConfigProc.cs b/clashN/clashN/Handler/ConfigProc.cs
@@ -498,7 +498,7 @@ public static int AddProfileCommon(ref Config config, ProfileItem profileItem)
  }
  if (profileItem.coreType is null)
  {
- profileItem.coreType = CoreKind.ClashMeta;
+ profileItem.coreType = CoreKind.Mihomo;
  }
  if (!config.ProfileItems.Exists(it => it.indexId == profileItem.indexId))
  {
@@ -558,7 +558,7 @@ public static int AddBatchProfiles(ref Config config, string clipboardData, stri
  {
  groupId = groupId,
  url = clipboardData,
- coreType = CoreKind.ClashMeta,
+ coreType = CoreKind.Mihomo,
  address = string.Empty,
  enabled = true,
  remarks = "clash_subscription"
@@ -582,7 +582,7 @@ public static int AddBatchProfiles(ref Config config, string clipboardData, stri
  {
  groupId = groupId,
  url = query["url"] ?? string.Empty,
- coreType = CoreKind.ClashMeta,
+ coreType = CoreKind.Mihomo,
  address = string.Empty,
  enabled = true,
  remarks = "clash_subscription"
@@ -600,7 +600,7 @@ public static int AddBatchProfiles(ref Config config, string clipboardData, stri
  {
  groupId = groupId,
  url = "",
- coreType = CoreKind.ClashMeta,
+ coreType = CoreKind.Mihomo,
  address = string.Empty,
  enabled = false,
  remarks = "clash_local_file"

diff --git a/clashN/clashN/Handler/MainFormHandler.cs b/clashN/clashN/Handler/MainFormHandler.cs
@@ -302,12 +302,12 @@ public void InitRegister(Config config)
  });
  }
 
- public List<ProxiesItem> GetClashProxyGroups()
+ public List<ProxiesItem>? GetClashProxyGroups()
  {
  try
  {
  var fileContent = LazyConfig.Instance.ProfileContent;
- if (!fileContent.ContainsKey("proxy-groups"))
+ if (fileContent is null || fileContent?.ContainsKey("proxy-groups") == false)
  {
  return null;
  }

diff --git a/clashN/clashN/Handler/StatisticsHandler.cs b/clashN/clashN/Handler/StatisticsHandler.cs
@@ -106,8 +106,9 @@ public async void Run()
  if (!string.IsNullOrEmpty(result))
  {
  var serverStatItem = config_.GetProfileItem(config_.IndexId);
+
  ParseOutput(result, out ulong up, out ulong down);
- if (up + down > 0)
+ if (serverStatItem != null && (up + down) > 0) 
  {
  serverStatItem.uploadRemote += up;
  serverStatItem.downloadRemote += down;

diff --git a/clashN/clashN/Tool/Utils.cs b/clashN/clashN/Tool/Utils.cs
@@ -86,16 +86,19 @@ public static string LoadResource(string res)
  /// <typeparam name="T"></typeparam>
  /// <param name="strJson"></param>
  /// <returns></returns>
- public static T FromJson<T>(string strJson)
+ public static T? FromJson<T>(string? strJson)
  {
  try
  {
- T obj = JsonConvert.DeserializeObject<T>(strJson);
- return obj;
+ if (string.IsNullOrEmpty(strJson))
+ {
+ return default;
+ }
+ return JsonConvert.DeserializeObject<T>(strJson);
  }
  catch
  {
- return JsonConvert.DeserializeObject<T>("");
+ return default;
  }
  }
 
@@ -104,14 +107,25 @@ public static T FromJson<T>(string strJson)
  /// </summary>
  /// <param name="obj"></param>
  /// <returns></returns>
- public static string ToJson(Object obj)
+ public static string ToJson(object? obj, bool indented = true)
  {
  string result = string.Empty;
  try
  {
- result = JsonConvert.SerializeObject(obj,
+ if (obj == null)
+ {
+ return result;
+ }
+ if (indented)
+ {
+ result = JsonConvert.SerializeObject(obj,
  Formatting.Indented,
  new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+ }
+ else
+ {
+ result = JsonConvert.SerializeObject(obj, new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
+ }
  }
  catch (Exception ex)
  {
@@ -895,18 +909,7 @@ public static string GetVersion(bool blFull = true)
  /// <returns></returns>
  public static T DeepCopy<T>(T obj)
  {
- object retval;
- using (MemoryStream ms = new MemoryStream())
- {
- BinaryFormatter bf = new BinaryFormatter();
- //序列化成流
- bf.Serialize(ms, obj);
- ms.Seek(0, SeekOrigin.Begin);
- //反序列化成对象
- retval = bf.Deserialize(ms);
- ms.Close();
- }
- return (T)retval;
+ return FromJson<T>(ToJson(obj, false))!; 
  }
 
  /// <summary>

diff --git a/clashN/clashN/ViewModels/HelpViewModel.cs b/clashN/clashN/ViewModels/HelpViewModel.cs
@@ -14,9 +14,9 @@ public class HelpViewModel : ReactiveObject
  private NoticeHandler? _noticeHandler;
 
  public ReactiveCommand<Unit, Unit> CheckUpdateCmd { get; }
- public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
+ //public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
  public ReactiveCommand<Unit, Unit> CheckUpdateMihomoCoreCmd { get; }
- public ReactiveCommand<Unit, Unit> CheckUpdateGeoDataCmd { get; }
+ //public ReactiveCommand<Unit, Unit> CheckUpdateGeoDataCmd { get; }
 
  public HelpViewModel()
  {
@@ -27,34 +27,34 @@ public HelpViewModel()
  {
  CheckUpdateN();
  });
- CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
- {
- CheckUpdateCore(CoreKind.Clash);
- });
+ //CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
+ //{
+ // CheckUpdateCore(CoreKind.Clash);
+ //});
  CheckUpdateMihomoCoreCmd = ReactiveCommand.Create(() =>
  {
  CheckUpdateCore(CoreKind.Mihomo);
  });
- CheckUpdateGeoDataCmd = ReactiveCommand.Create(() =>
- {
- CheckUpdateGeoData();
- });
+ //CheckUpdateGeoDataCmd = ReactiveCommand.Create(() =>
+ //{
+ // CheckUpdateGeoData();
+ //});
  }
 
- private void CheckUpdateGeoData()
- {
- void _updateUI(bool success, string msg)
- {
- _noticeHandler?.SendMessage(msg);
- if (success)
- {
- Locator.Current.GetService<MainWindowViewModel>()?.MyAppExit(false);
- }
- };
- UpdateHandle update = new UpdateHandle();
- update.UpdateGeoFile(GeoKind.GEO_IP, _config, _updateUI);
- update.UpdateGeoFile(GeoKind.GEO_SITE, _config, _updateUI);
- }
+ //private void CheckUpdateGeoData()
+ //{
+ // void _updateUI(bool success, string msg)
+ // {
+ // _noticeHandler?.SendMessage(msg);
+ // if (success)
+ // {
+ // Locator.Current.GetService<MainWindowViewModel>()?.MyAppExit(false);
+ // }
+ // };
+ // UpdateHandle update = new UpdateHandle();
+ // update.UpdateGeoFile(GeoKind.GEO_IP, _config, _updateUI);
+ // update.UpdateGeoFile(GeoKind.GEO_SITE, _config, _updateUI);
+ //}
 
  private void CheckUpdateN()
  {

diff --git a/clashN/clashN/ViewModels/ProfilesViewModel.cs b/clashN/clashN/ViewModels/ProfilesViewModel.cs
@@ -162,7 +162,7 @@ public void EditProfile(bool blNew)
  {
  item = new()
  {
- coreType = CoreKind.ClashMeta
+ coreType = CoreKind.Mihomo
  };
  }
  else

diff --git a/clashN/clashN/Views/HelpView.xaml b/clashN/clashN/Views/HelpView.xaml
@@ -96,42 +96,6 @@
  </DockPanel>
  </materialDesign:Card>
 
- <materialDesign:Card
- Width="300"
- Margin="8"
- Padding="16"
- materialDesign:UniformCornerRadius="8">
- <DockPanel>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <TextBlock
- Grid.Row="0"
- Margin="16,16,16,4"
- Style="{StaticResource TabItemTitle}"
- Text="Update Clash Core" />
-
- <Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
-
- <DockPanel Grid.Row="2" HorizontalAlignment="Right">
- <TextBlock
- Grid.Row="0"
- Margin="8"
- Style="{StaticResource MaterialDesignCaptionTextBlock}"
- Text="" />
- <Button
- x:Name="btnCheckUpdateClashCore"
- Width="100"
- Content="{x:Static resx:ResUI.TbHelpCheck}"
- DockPanel.Dock="Right"
- Style="{StaticResource DefButton}" />
- </DockPanel>
- </Grid>
- </DockPanel>
- </materialDesign:Card>
 
  <materialDesign:Card
  Width="300"
@@ -169,44 +133,8 @@
  </Grid>
  </DockPanel>
  </materialDesign:Card>
-
-
- <materialDesign:Card
- Width="300"
- Margin="8"
- Padding="16"
- materialDesign:UniformCornerRadius="8">
- <DockPanel>
- <Grid>
- <Grid.RowDefinitions>
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- <RowDefinition Height="Auto" />
- </Grid.RowDefinitions>
- <TextBlock
- Grid.Row="0"
- Margin="16,16,16,4"
- Style="{StaticResource TabItemTitle}"
- Text="Update Geo Data" />
 
- <Separator Grid.Row="1" Style="{StaticResource MaterialDesignLightSeparator}" />
 
- <DockPanel Grid.Row="2" HorizontalAlignment="Right">
- <TextBlock
- Grid.Row="0"
- Margin="8"
- Style="{StaticResource MaterialDesignCaptionTextBlock}"
- Text="" />
- <Button
- x:Name="btnCheckUpdateGeo"
- Width="100"
- Content="{x:Static resx:ResUI.TbHelpCheck}"
- DockPanel.Dock="Right"
- Style="{StaticResource DefButton}" />
- </DockPanel>
- </Grid>
- </DockPanel>
- </materialDesign:Card>
  </WrapPanel>
  </ScrollViewer>
  </DockPanel>

diff --git a/clashN/clashN/Views/HelpView.xaml.cs b/clashN/clashN/Views/HelpView.xaml.cs
@@ -17,9 +17,9 @@ public HelpView()
  this.WhenActivated(disposables =>
  {
  this.BindCommand(ViewModel, vm => vm.CheckUpdateCmd, v => v.btnCheckUpdateN).DisposeWith(disposables);
- this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.btnCheckUpdateClashCore).DisposeWith(disposables);
+ //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.btnCheckUpdateClashCore).DisposeWith(disposables);
  this.BindCommand(ViewModel, vm => vm.CheckUpdateMihomoCoreCmd, v => v.btnCheckUpdateMihomoCore).DisposeWith(disposables);
- this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoDataCmd, v => v.btnCheckUpdateGeo).DisposeWith(disposables);
+ //this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoDataCmd, v => v.btnCheckUpdateGeo).DisposeWith(disposables);
  });
  }