Compare commits

...

4 Commits

Author SHA1 Message Date
√(noham)²
6b181338c9
Merge branch 'nilaoda:main' into main 2024-09-08 12:50:57 +02:00
√(noham)²
48ba42b220 build try 2024-08-23 23:24:15 +02:00
√(noham)²
a824cb22e1 changes from larley 2024-08-23 23:08:29 +02:00
√(noham)²
b456e9e23a Update build_latest.yml 2024-07-01 00:00:07 +02:00
2 changed files with 26 additions and 24 deletions

View File

@ -33,6 +33,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
include-prerelease: true
- run: dotnet publish src/N_m3u8DL-RE -r win-x64 -c Release -o artifact-x64
- run: dotnet publish src/N_m3u8DL-RE -r win-arm64 -c Release -o artifact-arm64
@ -51,7 +52,8 @@ jobs:
build-linux-x64:
runs-on: ubuntu-latest
container: ubuntu:18.04
# container: ubuntu:18.04
container: ubuntu:22.04
steps:
- run: apt-get update
@ -61,6 +63,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
include-prerelease: true
- run: apt-get install -y libicu-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev
- run: dotnet publish src/N_m3u8DL-RE -r linux-x64 -c Release -o artifact
@ -72,7 +75,8 @@ jobs:
build-linux-arm64:
runs-on: ubuntu-latest
container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-20220312201346-b2c2436
# container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross-arm64-20220312201346-b2c2436
container: ubuntu:22.04
steps:
- uses: actions/checkout@v1
@ -80,6 +84,7 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
include-prerelease: true
- run: dotnet publish src/N_m3u8DL-RE -r linux-arm64 -c Release -p:StripSymbols=true -p:CppCompilerAndLinker=clang-9 -p:SysRoot=/crossrootfs/arm64 -o artifact
- name: Upload Artifact[linux-arm64]
@ -98,9 +103,9 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}
include-prerelease: true
- run: dotnet publish src/N_m3u8DL-RE -r osx-arm64 -c Release -o artifact-arm64
- run: dotnet publish src/N_m3u8DL-RE -r osx-x64 -c Release -o artifact-x64
- name: Upload Artifact[osx-x64]
uses: actions/upload-artifact@v3.1.3
with:

View File

@ -16,8 +16,6 @@ namespace N_m3u8DL_RE.Parser.Processor
public override bool CanProcess(ExtractorType extractorType, string oriUrl, ParserConfig paserConfig) => paserConfig.AppendUrlParams;
public override string Process(string oriUrl, ParserConfig paserConfig)
{
if (oriUrl.StartsWith("http"))
{
var uriFromConfig = new Uri(paserConfig.Url);
var uriFromConfigQuery = HttpUtility.ParseQueryString(uriFromConfig.Query);
@ -38,7 +36,6 @@ namespace N_m3u8DL_RE.Parser.Processor
oriUrl = (oldUri.GetLeftPart(UriPartial.Path) + "?" + newQuery.ToString()).TrimEnd('?');
Logger.Debug("After: " + oriUrl);
}
}
return oriUrl;
}