diff --git a/DepotDownloader/ContentDownloader.cs b/DepotDownloader/ContentDownloader.cs index 07884279..23d167df 100644 --- a/DepotDownloader/ContentDownloader.cs +++ b/DepotDownloader/ContentDownloader.cs @@ -405,7 +405,7 @@ namespace DepotDownloader if ( steam3.steamUser.SteamID.AccountType != EAccountType.AnonUser ) { - steam3.GetUGCDetails( ugcId ); + details = steam3.GetUGCDetails( ugcId ); } else { @@ -612,9 +612,6 @@ namespace DepotDownloader return null; } - // Skip requesting an app ticket - steam3.AppTickets[ depotId ] = null; - if (manifestId == INVALID_MANIFEST_ID) { manifestId = GetSteam3DepotManifest(depotId, appId, branch); diff --git a/DepotDownloader/DownloadConfig.cs b/DepotDownloader/DownloadConfig.cs index 780fd56a..2d27bf26 100644 --- a/DepotDownloader/DownloadConfig.cs +++ b/DepotDownloader/DownloadConfig.cs @@ -15,8 +15,6 @@ namespace DepotDownloader public List FilesToDownload { get; set; } public List FilesToDownloadRegex { get; set; } - public bool UsingExclusionList { get; set; } - public string BetaPassword { get; set; } public bool VerifyAll { get; set; } diff --git a/DepotDownloader/Steam3Session.cs b/DepotDownloader/Steam3Session.cs index 25d35962..e6f3f59c 100644 --- a/DepotDownloader/Steam3Session.cs +++ b/DepotDownloader/Steam3Session.cs @@ -31,7 +31,6 @@ namespace DepotDownloader private set; } - public Dictionary AppTickets { get; private set; } public Dictionary AppTokens { get; private set; } public Dictionary PackageTokens { get; private set; } public Dictionary DepotKeys { get; private set; } @@ -82,7 +81,6 @@ namespace DepotDownloader this.bDidReceiveLoginKey = false; this.seq = 0; - this.AppTickets = new Dictionary(); this.AppTokens = new Dictionary(); this.PackageTokens = new Dictionary(); this.DepotKeys = new Dictionary(); @@ -287,41 +285,6 @@ namespace DepotDownloader return success; } - public void RequestAppTicket( uint appId ) - { - if ( AppTickets.ContainsKey( appId ) || bAborted ) - return; - - - if ( !authenticatedUser ) - { - AppTickets[ appId ] = null; - return; - } - - bool completed = false; - Action cbMethod = ( appTicket ) => - { - completed = true; - - if ( appTicket.Result != EResult.OK ) - { - Console.WriteLine( "Unable to get appticket for {0}: {1}", appTicket.AppID, appTicket.Result ); - Abort(); - } - else - { - Console.WriteLine( "Got appticket for {0}!", appTicket.AppID ); - AppTickets[ appTicket.AppID ] = appTicket.Ticket; - } - }; - - WaitUntilCallback( () => - { - callbacks.Subscribe( steamApps.GetAppOwnershipTicket( appId ), cbMethod ); - }, () => { return completed; } ); - } - public void RequestDepotKey( uint depotId, uint appid = 0 ) { if ( DepotKeys.ContainsKey( depotId ) || bAborted ) @@ -414,37 +377,7 @@ namespace DepotDownloader callbacks.Subscribe( steamApps.CheckAppBetaPassword( appid, password ), cbMethod ); }, () => { return completed; } ); } - - public CPublishedFile_GetItemInfo_Response.WorkshopItemInfo GetPubfileItemInfo( uint appId, PublishedFileID pubFile ) - { - var pubFileRequest = new CPublishedFile_GetItemInfo_Request() { app_id = appId }; - pubFileRequest.workshop_items.Add( new CPublishedFile_GetItemInfo_Request.WorkshopItem() { published_file_id = pubFile } ); - - bool completed = false; - CPublishedFile_GetItemInfo_Response.WorkshopItemInfo details = null; - - Action cbMethod = callback => - { - completed = true; - if ( callback.Result == EResult.OK ) - { - var response = callback.GetDeserializedResponse(); - details = response.workshop_items.FirstOrDefault(); - } - else - { - throw new Exception( $"EResult {(int)callback.Result} ({callback.Result}) while retrieving UGC id for pubfile {pubFile}."); - } - }; - - WaitUntilCallback(() => - { - callbacks.Subscribe( steamPublishedFile.SendMessage( api => api.GetItemInfo( pubFileRequest ) ), cbMethod ); - }, () => { return completed; }); - - return details; - } - + public PublishedFileDetails GetPublishedFileDetails(uint appId, PublishedFileID pubFile) { var pubFileRequest = new CPublishedFile_GetDetails_Request() { appid = appId };