Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #677 from erri120/issue-519

Browse Source 
Attachments for IPS4 sites
This commit is contained in:
Timothy Baldridge 2020-04-04 15:34:55 -06:00 committed by GitHub
commit cd752f5580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 61 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Wabbajack.Lib/ACompiler.cs
View File

@ -91,6 +91,9 @@ namespace Wabbajack.Lib
{
if (a.State is IMetaState metaState)
{
if (string.IsNullOrWhiteSpace(metaState.URL))
return;
var b = await metaState.LoadMetaData();
Utils.Log(b
? $"Getting meta data for {a.Name} was successful!"

90
Wabbajack.Lib/Downloaders/AbstractIPS4Downloader.cs
View File

@ -5,7 +5,6 @@ using System.Net;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Web;
using HtmlAgilityPack;
using Newtonsoft.Json;
using Wabbajack.Common;
using Wabbajack.Lib.Validation;
@ -29,7 +28,16 @@ namespace Wabbajack.Lib.Downloaders
var absolute = true;
if (url == null || url.Host != SiteURL.Host) return null;
if (url.PathAndQuery.StartsWith("/applications/core/interface/file/attachment"))
{
return new TState
{
IsAttachment = true,
FullURL = url.ToString()
};
}
if (url.PathAndQuery.StartsWith("/index.php?"))
{
var id2 = HttpUtility.ParseQueryString(url.Query)["r"];
@ -37,6 +45,7 @@ namespace Wabbajack.Lib.Downloaders
var name = parsed[null].Split("/", StringSplitOptions.RemoveEmptyEntries).Last();
return new TState
{
FullURL = url.AbsolutePath,
FileID = id2,
FileName = name
};
@ -56,6 +65,7 @@ namespace Wabbajack.Lib.Downloaders
return new TState
{
FullURL = url.AbsolutePath,
FileID = id,
FileName = file
};
@ -64,6 +74,8 @@ namespace Wabbajack.Lib.Downloaders
public class State<TDownloader> : AbstractDownloadState, IMetaState where TDownloader : IDownloader
{
public string FullURL { get; set; }
public bool IsAttachment { get; set; }
public string FileID { get; set; }
public string FileName { get; set; }
@ -81,7 +93,9 @@ namespace Wabbajack.Lib.Downloaders
get
{
return FileID == null
? new object[] {Downloader.SiteURL, FileName}
? IsAttachment
? new object[] {Downloader.SiteURL, IsAttachment, FullURL}
: new object[] {Downloader.SiteURL, FileName}
: new object[] {Downloader.SiteURL, FileName, FileID};
}
}
@ -103,27 +117,32 @@ namespace Wabbajack.Lib.Downloaders
private async Task<Stream> ResolveDownloadStream()
{
//var downloader = (AbstractNeedsLoginDownloader)(object)DownloadDispatcher.GetInstance<TDownloader>();
TOP:
var csrfurl = FileID == null
? $"{Site}/files/file/{FileName}/?do=download"
: $"{Site}/files/file/{FileName}/?do=download&r={FileID}";
var html = await Downloader.AuthedClient.GetStringAsync(csrfurl);
string url;
if (IsAttachment)
{
url = FullURL;
}
else
{
var csrfURL = FileID == null
? $"{Site}/files/file/{FileName}/?do=download"
: $"{Site}/files/file/{FileName}/?do=download&r={FileID}";
var html = await Downloader.AuthedClient.GetStringAsync(csrfURL);
var pattern = new Regex("(?<=csrfKey=).*(?=[&\"\'])|(?<=csrfKey: \").*(?=[&\"\'])");
var matches = pattern.Matches(html).Cast<Match>();
var pattern = new Regex("(?<=csrfKey=).*(?=[&\"\'])|(?<=csrfKey: \").*(?=[&\"\'])");
var matches = pattern.Matches(html).Cast<Match>();
var csrfKey = matches.Where(m => m.Length == 32).Select(m => m.ToString()).FirstOrDefault();
if (csrfKey == null)
return null;
if (csrfKey == null)
return null;
var sep = Site.EndsWith("?") ? "&" : "?";
var url = FileID == null
? $"{Site}/files/file/{FileName}/{sep}do=download&confirm=1&t=1&csrfKey={csrfKey}"
: $"{Site}/files/file/{FileName}/{sep}do=download&r={FileID}&confirm=1&t=1&csrfKey={csrfKey}";
var sep = Site.EndsWith("?") ? "&" : "?";
url = FileID == null
? $"{Site}/files/file/{FileName}/{sep}do=download&confirm=1&t=1&csrfKey={csrfKey}"
: $"{Site}/files/file/{FileName}/{sep}do=download&r={FileID}&confirm=1&t=1&csrfKey={csrfKey}";
}
var streamResult = await Downloader.AuthedClient.GetAsync(url);
if (streamResult.StatusCode != HttpStatusCode.OK)
@ -174,37 +193,42 @@ namespace Wabbajack.Lib.Downloaders
public override string GetManifestURL(Archive a)
{
return $"{Site}/files/file/{FileName}/?do=download&r={FileID}";
return IsAttachment ? FullURL : $"{Site}/files/file/{FileName}/?do=download&r={FileID}";
}
public override string[] GetMetaIni()
{
if (FileID != null)
{
if (Site.EndsWith("?"))
{
return new[]
{
"[General]", $"directURL={Site}/files/file/{FileName}&do=download&r={FileID}&confirm=1&t=1"
};
}
if (IsAttachment)
return new[] {"[General]", $"directURL={FullURL}"};
if (FileID == null)
return new[] {"[General]", $"directURL={Site}/files/file/{FileName}"};
if (Site.EndsWith("?"))
{
return new[]
{
"[General]", $"directURL={Site}/files/file/{FileName}/?do=download&r={FileID}&confirm=1&t=1"
"[General]", $"directURL={Site}/files/file/{FileName}&do=download&r={FileID}&confirm=1&t=1"
};
}
return new[]
{
"[General]",
$"directURL={Site}/files/file/{FileName}"
"[General]", $"directURL={Site}/files/file/{FileName}/?do=download&r={FileID}&confirm=1&t=1"
};
}
// from IMetaState
public string URL => $"{Site}/files/file/{FileName}";
public string URL
{
get
{
return !IsAttachment ? $"{Site}/files/file/{FileName}" : "";
}
}
public string Name { get; set; }
public string Author { get; set; }
public string Version { get; set; }

1
Wabbajack/View Models/SlideShow.cs
View File

@ -89,6 +89,7 @@ namespace Wabbajack
return modList.SourceModList.Archives
.Select(m => m.State)
.OfType<IMetaState>()
.Where(x => !string.IsNullOrEmpty(x.URL) && !string.IsNullOrEmpty(x.ImageURL))
.DistinctBy(x => x.URL)
// Shuffle it
.Shuffle(_random)