Skip to content

Commit

Permalink
V1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
kengwang committed Jan 11, 2020
1 parent 0c767ce commit c07ed9e
Show file tree
Hide file tree
Showing 65 changed files with 4,029 additions and 615 deletions.
12 changes: 6 additions & 6 deletions BiliDuang/App.config
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
</startup>

<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
</configuration>
61 changes: 59 additions & 2 deletions BiliDuang/BiliDuang.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
<OutputType>WinExe</OutputType>
<RootNamespace>BiliDuang</RootNamespace>
<AssemblyName>BiliDuang</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -23,6 +24,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>8.0</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand All @@ -33,6 +35,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>8.0</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="MaterialSkin, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
Expand All @@ -56,9 +59,12 @@
<ItemGroup>
<Compile Include="DownloadObject.cs" />
<Compile Include="DownloadQueue.cs" />
<Compile Include="JSONCallback\LikeBoxItem.cs" />
<Compile Include="JSONCallback\Season.cs" />
<Compile Include="JSONCallback\Player.cs" />
<Compile Include="JSONCallback\UserBangumiFollow.cs" />
<Compile Include="JSONCallback\UserClass.cs" />
<Compile Include="JSONCallback\UserLikeBox.cs" />
<Compile Include="MainForm.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -100,6 +106,36 @@
<Compile Include="UI\Download\DownloadList.Designer.cs">
<DependentUpon>DownloadList.cs</DependentUpon>
</Compile>
<Compile Include="UI\LikeSelect.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\LikeSelect.Designer.cs">
<DependentUpon>LikeSelect.cs</DependentUpon>
</Compile>
<Compile Include="UI\LikeSelectItem.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\LikeSelectItem.Designer.cs">
<DependentUpon>LikeSelectItem.cs</DependentUpon>
</Compile>
<Compile Include="UI\UserDataForm\BangumiListItem.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\UserDataForm\BangumiListItem.Designer.cs">
<DependentUpon>BangumiListItem.cs</DependentUpon>
</Compile>
<Compile Include="UI\UserDataForm\LikeBoxItem.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="UI\UserDataForm\LikeBoxItem.Designer.cs">
<DependentUpon>LikeBoxItem.cs</DependentUpon>
</Compile>
<Compile Include="UI\UserDataForm\UserInfoForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\UserDataForm\UserInfoForm.Designer.cs">
<DependentUpon>UserInfoForm.cs</DependentUpon>
</Compile>
<Compile Include="UI\VideoList.cs">
<SubType>UserControl</SubType>
</Compile>
Expand All @@ -108,6 +144,7 @@
</Compile>
<Compile Include="User.cs" />
<Compile Include="VideoClass\AV.cs" />
<Compile Include="VideoClass\EP.cs" />
<Compile Include="VideoClass\SS.cs" />
<Compile Include="VideoClass\UP.cs" />
<Compile Include="VideoClass\Video.cs" />
Expand All @@ -123,6 +160,7 @@
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<EmbeddedResource Include="UI\AVCard.resx">
<DependentUpon>AVCard.cs</DependentUpon>
Expand All @@ -139,6 +177,21 @@
<EmbeddedResource Include="UI\Download\DownloadList.resx">
<DependentUpon>DownloadList.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\LikeSelect.resx">
<DependentUpon>LikeSelect.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\LikeSelectItem.resx">
<DependentUpon>LikeSelectItem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\UserDataForm\BangumiListItem.resx">
<DependentUpon>BangumiListItem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\UserDataForm\LikeBoxItem.resx">
<DependentUpon>LikeBoxItem.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\UserDataForm\UserInfoForm.resx">
<DependentUpon>UserInfoForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="UI\VideoList.resx">
<DependentUpon>VideoList.cs</DependentUpon>
</EmbeddedResource>
Expand All @@ -156,6 +209,10 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="ffmpeg.exe">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
11 changes: 4 additions & 7 deletions BiliDuang/DownloadObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace BiliDuang
Expand Down Expand Up @@ -36,21 +33,21 @@ public bool complete
fc += string.Format("file '{0}'" + "\r\n", SaveTo + "\\" + DownloadName + "_" + i.ToString() + ".flv");
}
File.WriteAllText(SaveTo + "\\" + DownloadName + "_files.txt", fc);
string argu = string.Format("-y -f concat -safe 0 -i \"{0}\" -c copy \"{1}\"", SaveTo + "\\" + DownloadName + "_files.txt", SaveTo + "\\" + DownloadName + ".flv");
string argu = string.Format("-y -f concat -safe 0 -i \"{0}\" -c copy \"{1}\"", SaveTo + "\\" + DownloadName + "_files.txt", SaveTo + "\\" + DownloadName + "_0.flv");
Process.Start("ffmpeg", argu).WaitForExit();
for (int i = 0; i < completeCount; i++)
{
File.Delete(SaveTo + "\\" + DownloadName + "_" + i.ToString() + ".flv");
}
DownloadQueue.StartAll();
//DownloadQueue.StartAll();
Cancel();
}
else if (urls.Count == 1)
{
_complete = value;
FStream.Close();
File.Move(SaveTo + "\\" + DownloadName + "_0.flv", SaveTo + "\\" + DownloadName + ".flv");
DownloadQueue.StartAll();
File.Move(SaveTo + "\\" + DownloadName + "_0.flv", SaveTo + "\\" + DownloadName + "_0.flv");
//DownloadQueue.StartAll();
Cancel();
}
else
Expand Down
6 changes: 1 addition & 5 deletions BiliDuang/DownloadQueue.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;

namespace BiliDuang
{
Expand Down
64 changes: 64 additions & 0 deletions BiliDuang/JSONCallback/LikeBoxItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace BiliDuang.JSONCallback.LikeBoxItem
{
public class DataItem
{
/// <summary>
///
/// </summary>
public string bv_id { get; set; }
/// <summary>
///
/// </summary>
public string bvid { get; set; }
/// <summary>
///
/// </summary>
public int fav_state { get; set; }
/// <summary>
///
/// </summary>
public int fav_time { get; set; }
/// <summary>
///
/// </summary>
public int id { get; set; }
/// <summary>
///
/// </summary>
public int like_state { get; set; }
/// <summary>
///
/// </summary>
public int page { get; set; }
/// <summary>
///
/// </summary>
public string short_link { get; set; }
/// <summary>
///
/// </summary>
public int type { get; set; }
}

public class LikeBoxItem
{
/// <summary>
///
/// </summary>
public int code { get; set; }
/// <summary>
///
/// </summary>
public List<DataItem> data { get; set; }
/// <summary>
///
/// </summary>
public string message { get; set; }
}
}
6 changes: 1 addition & 5 deletions BiliDuang/JSONCallback/Player.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;

namespace BiliDuang.JSONCallback.Player
{
Expand Down
6 changes: 1 addition & 5 deletions BiliDuang/JSONCallback/Season.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Collections.Generic;

namespace BiliDuang.JSONCallback.Season
{
Expand Down
Loading

0 comments on commit c07ed9e

Please sign in to comment.