worker prints start success but no attachment yet

This commit is contained in:
Nathan
2025-12-17 16:32:39 -07:00
parent 4628fafc79
commit 0460865ebc
10 changed files with 7160 additions and 45 deletions

View File

@@ -9,6 +9,7 @@ namespace UnifiedFarmLauncher.ViewModels
private string _sheepItUsername = string.Empty;
private string _sheepItRenderKey = string.Empty;
private bool _isRenderKeyVisible = false;
private string _flamencoWorkerPath = string.Empty;
public GlobalSettingsViewModel(ConfigService configService)
{
@@ -34,11 +35,18 @@ namespace UnifiedFarmLauncher.ViewModels
set => SetAndRaise(ref _isRenderKeyVisible, value);
}
public string FlamencoWorkerPath
{
get => _flamencoWorkerPath;
set => SetAndRaise(ref _flamencoWorkerPath, value);
}
private void LoadSettings()
{
var config = _configService.Load();
SheepItUsername = config.GlobalSettings.SheepItUsername;
SheepItRenderKey = config.GlobalSettings.SheepItRenderKey;
FlamencoWorkerPath = config.GlobalSettings.FlamencoWorkerPath;
}
public void Save()
@@ -46,6 +54,7 @@ namespace UnifiedFarmLauncher.ViewModels
var config = _configService.Load();
config.GlobalSettings.SheepItUsername = SheepItUsername;
config.GlobalSettings.SheepItRenderKey = SheepItRenderKey;
config.GlobalSettings.FlamencoWorkerPath = FlamencoWorkerPath;
_configService.Save(config);
}
}

View File

@@ -16,7 +16,6 @@ namespace UnifiedFarmLauncher.ViewModels
private int _sshPort = 22;
private string _sshArgs = string.Empty;
private string _sheepItGpu = "OPTIX_0";
private string _flamencoWorkerPath = string.Empty;
private bool _hasSheepIt;
private bool _hasFlamenco;
@@ -91,12 +90,6 @@ namespace UnifiedFarmLauncher.ViewModels
set => SetAndRaise(ref _sheepItGpu, value);
}
public string FlamencoWorkerPath
{
get => _flamencoWorkerPath;
set => SetAndRaise(ref _flamencoWorkerPath, value);
}
public ObservableCollection<string> NetworkDrives { get; }
public ObservableCollection<string> NetworkPaths { get; }
@@ -118,7 +111,6 @@ namespace UnifiedFarmLauncher.ViewModels
if (worker.WorkerTypes.Flamenco != null)
{
HasFlamenco = true;
FlamencoWorkerPath = worker.WorkerTypes.Flamenco.WorkerPath;
NetworkDrives.Clear();
foreach (var drive in worker.WorkerTypes.Flamenco.NetworkDrives)
{
@@ -160,7 +152,6 @@ namespace UnifiedFarmLauncher.ViewModels
{
worker.WorkerTypes.Flamenco = new FlamencoConfig
{
WorkerPath = FlamencoWorkerPath,
NetworkDrives = NetworkDrives.ToList(),
NetworkPaths = NetworkPaths.ToList()
};