Skip to content

Commit

Permalink
fix: TV api parsing issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Jared-02 committed Mar 29, 2024
1 parent eb4d6fb commit 9fed37b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 11 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build_latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,20 +124,20 @@ jobs:
env:
TZ: Asia/Shanghai
run: |
echo "release_tag=$(date +"%Y.%m.%d-%H%M")" >> $GITHUB_OUTPUT
echo "RELEASE_DATE=$(date +"%Y%m%d%H%M")" >> $GITHUB_ENV
echo "release_date=$(date +"%Y-%m-%d %H:%M")" >> $GITHUB_OUTPUT
echo "tag_date=$(date +"%Y%m%d-%H%M")" >> $GITHUB_OUTPUT
touch release.txt
echo "${{ github.sha }}" >> release.txt
echo "status=success" >> $GITHUB_OUTPUT
- name: Pack artifacts
env:
RELEASE_DATE: ${{ env.RELEASE_DATE }}
TAG_DATE: ${{ steps.tag.outputs.tag_date }}
run: |
ls -R actions
for dir in actions/*; do
if [ -d "$dir" ]; then
zip -r "${dir}_${RELEASE_DATE}.zip" "$dir"
zip -r "${dir}_${TAG_DATE}.zip" "$dir"
fi
done
Expand All @@ -147,6 +147,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ steps.tag.outputs.release_tag }}
name: "Auto-Build ${{ steps.tag.outputs.release_date }}"
tag_name: ${{ steps.tag.outputs.tag_date }}
body_path: release.txt
files: actions/*.zip
16 changes: 10 additions & 6 deletions BBDown.Core/Parser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private static async Task<string> GetPlayJsonAsync(string encoding, string aidOr

if (appApi) return await AppHelper.DoReqAsync(aid, cid, epId, qn, bangumi, encoding, Config.TOKEN);

string prefix = tvApi ? bangumi ? "api.snm0516.aisee.tv/pgc/player/api/playurltv" : "api.snm0516.aisee.tv/x/tv/ugc/playurl"
string prefix = tvApi ? bangumi ? "api.snm0516.aisee.tv/pgc/player/api/playurltv" : "api.snm0516.aisee.tv/x/tv/playurl"
: bangumi ? $"{Config.HOST}/pgc/player/web/playurl" : "api.bilibili.com/x/player/wbi/playurl";
prefix = $"https://{prefix}?";

Expand All @@ -45,17 +45,21 @@ private static async Task<string> GetPlayJsonAsync(string encoding, string aidOr
$"&qn={qn}&ts={GetTimeStamp(true)}";
api = prefix + api + $"&sign={GetSign(api, false)}";
}
if (tvApi)
{
api = (Config.TOKEN != "" ? $"access_key={Config.TOKEN}&" : "") +
$"object_id={aid}&appkey=4409e2ce8ffd12b8&build=106500" +
$"&cid={cid}&device=android&fnval=4048&fnver=0&fourk=1" +
$"&mid=0&mobi_app=android_tv_yst" +
$"&playurl_type=1&platform=android&qn={qn}";
api = prefix + api;
}
else
{
// 尝试提高可读性
StringBuilder apiBuilder = new();
apiBuilder.Append($"avid={aid}&cid={cid}&fnval=4048&fnver=0&fourk=1");
if (Config.AREA != "") apiBuilder.Append($"&access_key={Config.TOKEN}&area={Config.AREA}");
if (tvApi)
{
apiBuilder.Append("&device=android&platform=android&mobi_app=android_tv_yst&npcybs=0&force_host=2&build=102801");
if(Config.TOKEN != "") apiBuilder.Append($"&access_key={Config.TOKEN}");
}
apiBuilder.Append($"&otype=json&qn={qn}");
if (bangumi) apiBuilder.Append($"&module=bangumi&ep_id={epId}&session=");
else if (!tvApi)
Expand Down

0 comments on commit 9fed37b

Please sign in to comment.