github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Add system proxy for kde

pull/5840/head
2dust 2024-10-15 20:22:26 +08:00
parent fb649c04cf
commit 35e5475255
3 changed files with 107 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
v2rayN/ServiceLib/Common/Utils.cs
View File

@ -600,7 +600,7 @@ namespace ServiceLib.Common
return await GetCliWrapOutput(filePath, arg != null ? new List<string>() { arg } : null); return await GetCliWrapOutput(filePath, arg != null ? new List<string>() { arg } : null);
} }
private static async Task<string?> GetCliWrapOutput(string filePath, IEnumerable<string>? args) public static async Task<string?> GetCliWrapOutput(string filePath, IEnumerable<string>? args)
{ {
try try
{ {

2
v2rayN/ServiceLib/Models/CmdItem.cs
View File

@ -3,6 +3,6 @@
public class CmdItem public class CmdItem
{ {
public string? Cmd { get; set; } public string? Cmd { get; set; }
public string? Arguments { get; set; } public List<string>? Arguments { get; set; }
} }
} }

140
v2rayN/v2rayN.Desktop/Common/ProxySettingLinux.cs
View File

@ -20,8 +20,10 @@
{ {
foreach (var cmd in lstCmd) foreach (var cmd in lstCmd)
{ {
if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments.IsNullOrEmpty()) if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
{ continue; } {
continue;
}
await Task.Delay(10); await Task.Delay(10);
await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments); await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
} }
@ -29,54 +31,122 @@
private static List<CmdItem> GetSetCmds(string host, int port) private static List<CmdItem> GetSetCmds(string host, int port)
{ {
//TODO KDE //XDG_CURRENT_DESKTOP var isKde = IsKde(out var configDir);
List<string> lstType = ["http", "https", "socks", "ftp"]; List<string> lstType = ["", "http", "https", "socks", "ftp"];
List<CmdItem> lstCmd = []; List<CmdItem> lstCmd = [];
lstCmd.Add(new CmdItem() if (isKde)
{ {
Cmd = "gsettings", foreach (var type in lstType)
Arguments = "set org.gnome.system.proxy mode manual" {
}); lstCmd.AddRange(GetSetCmd4Kde(type, host, port, configDir));
}
foreach (string type in lstType)
{
lstCmd.AddRange(GetSetCmdByType(type, host, port));
} }
else
return lstCmd;
}
private static List<CmdItem> GetSetCmdByType(string type, string host, int port)
{
List<CmdItem> lstCmd = [];
lstCmd.Add(new()
{ {
Cmd = "gsettings", foreach (var type in lstType)
Arguments = $"set org.gnome.system.proxy.{type} host {host}", {
}); lstCmd.AddRange(GetSetCmd4Gnome(type, host, port));
}
lstCmd.Add(new() }
{
Cmd = "gsettings",
Arguments = $"set org.gnome.system.proxy.{type} port {port}",
});
return lstCmd; return lstCmd;
} }
private static List<CmdItem> GetUnsetCmds() private static List<CmdItem> GetUnsetCmds()
{ {
//TODO KDE var isKde = IsKde(out var configDir);
List<CmdItem> lstCmd = []; List<CmdItem> lstCmd = [];
lstCmd.Add(new CmdItem() if (isKde)
{ {
Cmd = "gsettings", lstCmd.Add(new CmdItem()
Arguments = "set org.gnome.system.proxy mode none" {
}); Cmd = "kwriteconfig5",
Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
});
}
else
{
lstCmd.Add(new CmdItem()
{
Cmd = "gsettings",
Arguments = ["set", "org.gnome.system.proxy", "mode", "none"]
});
}
return lstCmd; return lstCmd;
} }
private static List<CmdItem> GetSetCmd4Kde(string type, string host, int port, string configDir)
{
List<CmdItem> lstCmd = [];
if (type.IsNullOrEmpty())
{
lstCmd.Add(new()
{
Cmd = "kwriteconfig5",
Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1"]
});
}
else
{
var type2 = type.Equals("https") ? "http" : type;
lstCmd.Add(new CmdItem()
{
Cmd = "kwriteconfig5",
Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", $"{type}Proxy", $"{type2}://{host}:{port}"]
});
}
return lstCmd;
}
private static List<CmdItem> GetSetCmd4Gnome(string type, string host, int port)
{
List<CmdItem> lstCmd = [];
if (type.IsNullOrEmpty())
{
lstCmd.Add(new()
{
Cmd = "gsettings",
Arguments = ["set", "org.gnome.system.proxy", "mode", "manual"]
});
}
else
{
lstCmd.Add(new()
{
Cmd = "gsettings",
Arguments = ["set", $"org.gnome.system.proxy.{type}", "host", host]
});
lstCmd.Add(new()
{
Cmd = "gsettings",
Arguments = ["set", $"org.gnome.system.proxy.{type}", "port", $"{port}"]
});
}
return lstCmd;
}
private static bool IsKde(out string configDir)
{
configDir = "/home";
var desktop = Environment.GetEnvironmentVariable("XDG_CURRENT_DESKTOP");
var isKde = string.Equals(desktop, "KDE", StringComparison.OrdinalIgnoreCase);
if (isKde)
{
var homeDir = Environment.GetEnvironmentVariable("HOME");
if (homeDir != null)
{
configDir = Path.Combine(homeDir, ".config");
}
}
return isKde;
}
} }
} }