Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PalworldModUploader/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@
<DataGridTextColumn Header="Author"
Binding="{Binding Author}"
Width="2*" />
<DataGridCheckBoxColumn Header="Subscribed"
Binding="{Binding IsSubscribed}"
Width="*" />
<!-- <DataGridCheckBoxColumn Header="Your Item"
Binding="{Binding IsOwnedByUser}"
Width="*" /> -->
</DataGrid.Columns>
</DataGrid>

Expand Down
25 changes: 14 additions & 11 deletions PalworldModUploader/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public partial class MainWindow : Window
private const string WorkshopAgreementUrl = "https://steamcommunity.com/sharedfiles/workshoplegalagreement";

private readonly ObservableCollection<ModDirectoryEntry> _modEntries = new();
private ulong[] _subscribedItemIds = Array.Empty<ulong>();
private Dictionary<ulong, bool> _subscribedItemIds = new();
private readonly JsonSerializerOptions _jsonOptions = new()
{
AllowTrailingCommas = true,
Expand Down Expand Up @@ -116,7 +116,7 @@ private async void OnLoaded(object? sender, RoutedEventArgs e)
WorkshopDirTextBox.Text = _workshopContentDirectory;
LoadModsFromDirectory(_workshopContentDirectory);

if (!foundSubscribed && _subscribedItemIds.Length == 0)
if (!foundSubscribed && _subscribedItemIds.Count == 0)
{
StatusTextBlock.Text = "No workshop subscriptions were detected via Steam. Using the configured directory.";
}
Expand Down Expand Up @@ -156,9 +156,9 @@ private async Task<bool> DiscoverWorkshopContentDirectoryAsync()

private async Task<bool> RefreshSubscribedItemsAsync()
{
_subscribedItemIds = Array.Empty<ulong>();
_subscribedItemIds = new Dictionary<ulong, bool>();

var subscribedItemIds = new List<ulong>();
var subscribedItemIds = new Dictionary<ulong, bool>();

uint pageNumber = 1;
uint processedResults = 0;
Expand Down Expand Up @@ -207,9 +207,9 @@ private async Task<bool> RefreshSubscribedItemsAsync()
}
}

_subscribedItemIds = subscribedItemIds.ToArray();
_subscribedItemIds = subscribedItemIds;

return receivedAnyResult && _subscribedItemIds.Length > 0;
return receivedAnyResult && _subscribedItemIds.Count > 0;
}

private async Task<(SteamUGCQueryCompleted_t Data, bool IoFailure)?> SendSubscribedItemsQueryAsync(uint pageNumber)
Expand Down Expand Up @@ -255,7 +255,7 @@ private async Task<bool> RefreshSubscribedItemsAsync()
}
}

private void ProcessSubscriptionResults(SteamUGCQueryCompleted_t data, ICollection<ulong> subscribedItemIds)
private void ProcessSubscriptionResults(SteamUGCQueryCompleted_t data, IDictionary<ulong, bool> subscribedItemIds)
{
for (uint i = 0; i < data.m_unNumResultsReturned; i++)
{
Expand All @@ -265,7 +265,8 @@ private void ProcessSubscriptionResults(SteamUGCQueryCompleted_t data, ICollecti
}

var publishedFileId = details.m_nPublishedFileId;
subscribedItemIds.Add(publishedFileId.m_PublishedFileId);
var isOwnedByUser = details.m_ulSteamIDOwner == SteamUser.GetSteamID().m_SteamID;
subscribedItemIds[publishedFileId.m_PublishedFileId] = isOwnedByUser;
}
}

Expand Down Expand Up @@ -364,14 +365,16 @@ private void LoadModsFromDirectory(string baseDirectory)
var dirInfo = new DirectoryInfo(directory);
var entry = new ModDirectoryEntry(dirInfo.Name, dirInfo.FullName);

if (ulong.TryParse(dirInfo.Name, out var directoryId) && _subscribedItemIds.Contains(directoryId))
if (ulong.TryParse(dirInfo.Name, out var directoryId) && _subscribedItemIds.TryGetValue(directoryId, out var isOwnedByUser))
{
entry.IsSubscribed = true;
entry.SubscribedPublishedFileId = directoryId;
entry.IsOwnedByUser = isOwnedByUser;
}
else
{
entry.Metadata = LoadMetadata(dirInfo.FullName);
entry.IsOwnedByUser = false;
}

var infoPath = Path.Combine(dirInfo.FullName, "Info.json");
Expand Down Expand Up @@ -532,7 +535,7 @@ private void UpdateModDetails()
PalSchemaTypeCheckBox.IsEnabled = canEditInstallRules;
InstallRuleManualWarning.Visibility = (canEdit && !isInstallRuleStandard) ? Visibility.Visible : Visibility.Collapsed;

UploadButton.IsEnabled = !_selectedEntry.IsSubscribed;
//UploadButton.IsEnabled = _selectedEntry.IsOwnedByUser;
OpenModDirectoryButton.IsEnabled = true;
OpenInSteamButton.IsEnabled = true;
SaveModInfoButton.IsEnabled = false;
Expand Down Expand Up @@ -642,7 +645,7 @@ private async void ReloadButton_Click(object sender, RoutedEventArgs e)
PersistWorkshopDirectory(_workshopContentDirectory);
LoadModsFromDirectory(_workshopContentDirectory);

if (!foundSubscribed && _subscribedItemIds.Length == 0)
if (!foundSubscribed && _subscribedItemIds.Count == 0)
{
StatusTextBlock.Text = "No workshop subscriptions were detected via Steam. Loaded the configured directory.";
}
Expand Down
16 changes: 16 additions & 0 deletions PalworldModUploader/ViewModels/ModDirectoryEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ public sealed class ModDirectoryEntry : INotifyPropertyChanged
private ModInfo? _info;
private WorkshopMetadata? _metadata;
private bool _isSubscribed;
private bool _isOwnedByUser;
private string? _infoLoadError;
private ulong? _subscribedPublishedFileId;

Expand Down Expand Up @@ -93,6 +94,21 @@ public bool IsSubscribed
}
}

public bool IsOwnedByUser
{
get => _isOwnedByUser;
set
{
if (_isOwnedByUser == value)
{
return;
}

_isOwnedByUser = value;
OnPropertyChanged(nameof(IsOwnedByUser));
}
}

public string? InfoLoadError
{
get => _infoLoadError;
Expand Down