Skip to content

Commit c1f472e

Browse files
zamgizamgi
zamgi
authored and
zamgi
committed
...
1 parent 3ddc6a4 commit c1f472e

24 files changed

+731
-401
lines changed

‎m3u8.client/m3u8.client.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ public struct m3u8_part_ts
8888
/// <summary>
8989
///
9090
/// </summary>
91-
public readonly struct comparer: IComparer< m3u8_part_ts >
91+
public readonly struct Comparer: IComparer< m3u8_part_ts >
9292
{
93-
public static comparer Inst { get; } = new comparer();
93+
public static Comparer Inst { get; } = new Comparer();
9494
public int Compare( m3u8_part_ts x, m3u8_part_ts y ) => (x.OrderNumber - y.OrderNumber);
9595
}
9696

@@ -148,9 +148,9 @@ public struct m3u8_part_ts__v2 : IDisposable
148148
/// <summary>
149149
///
150150
/// </summary>
151-
public readonly struct comparer: IComparer< m3u8_part_ts__v2 >
151+
public readonly struct Comparer: IComparer< m3u8_part_ts__v2 >
152152
{
153-
public static comparer Inst { get; } = new comparer();
153+
public static Comparer Inst { get; } = new Comparer();
154154
public int Compare( m3u8_part_ts__v2 x, m3u8_part_ts__v2 y ) => (x.OrderNumber - y.OrderNumber);
155155
}
156156

‎m3u8.client/m3u8.client.factory.cs

+16-16
Original file line numberDiff line numberDiff line change
@@ -206,19 +206,19 @@ public struct init_params
206206
/// <summary>
207207
///
208208
/// </summary>
209-
private sealed class tuple
209+
private sealed class tuple_t
210210
{
211211
/// <summary>
212212
///
213213
/// </summary>
214-
public struct EqualityComparer : IEqualityComparer< tuple >
214+
public struct EqualityComparer : IEqualityComparer< tuple_t >
215215
{
216-
public bool Equals( tuple x, tuple y ) => (x.Timeout == y.Timeout);
217-
public int GetHashCode( tuple obj ) => obj.Timeout.GetHashCode();
216+
public bool Equals( tuple_t x, tuple_t y ) => (x.Timeout == y.Timeout);
217+
public int GetHashCode( tuple_t obj ) => obj.Timeout.GetHashCode();
218218
}
219219

220-
private tuple( TimeSpan timeout ) => Timeout = timeout;
221-
public tuple( TimeSpan timeout, HttpClient httpClient ) => (Timeout, HttpClient, RefCount) = (timeout, httpClient, 0);
220+
private tuple_t( TimeSpan timeout ) => Timeout = timeout;
221+
public tuple_t( TimeSpan timeout, HttpClient httpClient ) => (Timeout, HttpClient, RefCount) = (timeout, httpClient, 0);
222222

223223
public TimeSpan Timeout { get; }
224224
public HttpClient HttpClient { get; }
@@ -227,23 +227,23 @@ public struct EqualityComparer : IEqualityComparer< tuple >
227227
public int IncrementRefCount() => ++RefCount;
228228
public int DecrementRefCount() => --RefCount;
229229

230-
public static tuple key( TimeSpan? timeout ) => new tuple( timeout.GetValueOrDefault( TimeSpan.Zero ) );
230+
public static tuple_t key( TimeSpan? timeout ) => new tuple_t( timeout.GetValueOrDefault( TimeSpan.Zero ) );
231231
#if DEBUG
232232
public override string ToString() => $"{Timeout}, (ref: {RefCount})";
233233
#endif
234234
}
235235

236-
private static ILRUCache< tuple > _LRUCache;
236+
private static ILRUCache< tuple_t > _LRUCache;
237237

238-
static HttpClientFactory_WithRefCount() => _LRUCache = LRUCache< tuple >.CreateWithLimitMaxValue( 0x10, new tuple.EqualityComparer() );
238+
static HttpClientFactory_WithRefCount() => _LRUCache = LRUCache< tuple_t >.CreateWithLimitMaxValue( 0x10, new tuple_t.EqualityComparer() );
239239

240240
/// <summary>
241241
///
242242
/// </summary>
243243
private struct free_tuple : IDisposable
244244
{
245-
private tuple _tuple;
246-
public free_tuple( tuple t ) => _tuple = t ?? throw (new ArgumentNullException( nameof(t) ));
245+
private tuple_t _tuple;
246+
public free_tuple( tuple_t t ) => _tuple = t ?? throw (new ArgumentNullException( nameof(t) ));
247247

248248
public void Dispose()
249249
{
@@ -274,8 +274,8 @@ static void set_Protocol( SslClientAuthenticationOptions sslOptions, SslProtocol
274274

275275
var h = new SocketsHttpHandler();
276276
h.SslOptions.RemoteCertificateValidationCallback = (sender, certificate, chain, sslPolicyErrors) => true;
277-
set_Protocol( h.SslOptions, SslProtocols.Tls );
278-
set_Protocol( h.SslOptions, SslProtocols.Tls11 );
277+
//set_Protocol( h.SslOptions, SslProtocols.Tls );
278+
//set_Protocol( h.SslOptions, SslProtocols.Tls11 );
279279
set_Protocol( h.SslOptions, SslProtocols.Tls12 );
280280
#pragma warning disable CS0618
281281
set_Protocol( h.SslOptions, SslProtocols.Ssl2 );
@@ -303,12 +303,12 @@ static void set_Protocol( SslClientAuthenticationOptions sslOptions, SslProtocol
303303
public static (HttpClient, IDisposable) Get( in init_params ip ) => Get( ip.Timeout );
304304
public static (HttpClient, IDisposable) Get( in TimeSpan? timeout = null )
305305
{
306-
var key = tuple.key( timeout );
306+
var key = tuple_t.key( timeout );
307307
lock ( _LRUCache )
308308
{
309309
if ( !_LRUCache.TryGetValue( key, out var t ) )
310310
{
311-
t = new tuple( key.Timeout, CreateHttpClient( in timeout ) );
311+
t = new tuple_t( key.Timeout, CreateHttpClient( in timeout ) );
312312
_LRUCache.Add( t );
313313
}
314314
t.IncrementRefCount();
@@ -327,7 +327,7 @@ select et
327327
}
328328
}
329329

330-
private static void Release( tuple t )
330+
private static void Release( tuple_t t )
331331
{
332332
lock ( _LRUCache )
333333
{

‎m3u8.client/m3u8_processor.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ private static IEnumerable< m3u8_part_ts > download_m3u8File_parts_parallel( dow
297297
var expectedPartNumber = ip.m3u8File.Parts.FirstOrDefault().OrderNumber;
298298
var maxPartNumber = ip.m3u8File.Parts.LastOrDefault ().OrderNumber;
299299
var sourceQueue = new Queue< m3u8_part_ts >( ip.m3u8File.Parts );
300-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
300+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
301301

302302
using ( DefaultConnectionLimitSaver.Create( ip.maxDegreeOfParallelism ) )
303303
using ( var innerCts = new CancellationTokenSource() )

‎m3u8.client/m3u8_processor__v2.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ private static IEnumerable< m3u8_part_ts__v2 > download_m3u8File_parts_parallel(
300300
var expectedPartNumber = ip.m3u8File.Parts.FirstOrDefault().OrderNumber;
301301
var maxPartNumber = ip.m3u8File.Parts.LastOrDefault ().OrderNumber;
302302
var sourceQueue = new Queue< m3u8_part_ts__v2 >( ip.m3u8File.Parts );
303-
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.comparer.Inst );
303+
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.Comparer.Inst );
304304
var poolStreamCapacity = ip.poolStreamCapacity.GetValueOrDefault( 1024 * 1024 * 5 );
305305

306306
using ( DefaultConnectionLimitSaver.Create( ip.maxDegreeOfParallelism ) )

‎m3u8.client/m3u8_processor_adv.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private static IEnumerable< m3u8_part_ts > download_m3u8File_parts_parallel( Dow
3131
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
3232
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
3333
var sourceQueue = new Queue< m3u8_part_ts >( m3u8File.Parts );
34-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
34+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
3535

3636
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )
3737
using ( var innerCts = new CancellationTokenSource() )
@@ -187,7 +187,7 @@ private static async IAsyncEnumerable< m3u8_part_ts > download_m3u8File_parts_pa
187187
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
188188
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
189189
var sourceQueue = new Queue< m3u8_part_ts >( m3u8File.Parts );
190-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
190+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
191191

192192
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )
193193
using ( var innerCts = new CancellationTokenSource() )

‎m3u8.client/m3u8_processor_adv__v2.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ private static IEnumerable< m3u8_part_ts__v2 > download_m3u8File_parts_parallel(
3030
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
3131
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
3232
var sourceQueue = new Queue< m3u8_part_ts__v2 >( m3u8File.Parts );
33-
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.comparer.Inst );
33+
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.Comparer.Inst );
3434
//var poolStreamCapacity = ip.PoolStreamCapacity.GetValueOrDefault( 1024 * 1024 * 5 );
3535

3636
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )
@@ -192,7 +192,7 @@ private static async IAsyncEnumerable< m3u8_part_ts__v2 > download_m3u8File_part
192192
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
193193
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
194194
var sourceQueue = new Queue< m3u8_part_ts__v2 >( m3u8File.Parts );
195-
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.comparer.Inst );
195+
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.Comparer.Inst );
196196
//var poolStreamCapacity = ip.PoolStreamCapacity.GetValueOrDefault( 1024 * 1024 * 5 );
197197

198198
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )

‎m3u8.client/m3u8_processor_next.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ private static IEnumerable< m3u8_part_ts__v2 > download_m3u8File_parts_parallel(
298298
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
299299
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
300300
var sourceQueue = new Queue< m3u8_part_ts__v2 >( m3u8File.Parts );
301-
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.comparer.Inst );
301+
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.Comparer.Inst );
302302

303303
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )
304304
using ( var innerCts = new CancellationTokenSource() )
@@ -465,7 +465,7 @@ private static async IAsyncEnumerable< m3u8_part_ts__v2 > download_m3u8File_part
465465
var expectedPartNumber = m3u8File.Parts.FirstOrDefault().OrderNumber;
466466
var maxPartNumber = m3u8File.Parts.LastOrDefault ().OrderNumber;
467467
var sourceQueue = new Queue< m3u8_part_ts__v2 >( m3u8File.Parts );
468-
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.comparer.Inst );
468+
var downloadPartsSet = new SortedSet< m3u8_part_ts__v2 >( m3u8_part_ts__v2.Comparer.Inst );
469469

470470
using ( var throttlerBySpeed_User = ThrottlerBySpeed_InDownloadProcessUser.Start( ip.ThrottlerBySpeed ) )
471471
using ( var innerCts = new CancellationTokenSource() )

‎m3u8.console.app/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private static IReadOnlyCollection< m3u8_part_ts > download_m3u8File_parallel( m
3131
var baseAddress = m3u8_file.BaseAddress;
3232
var totalPatrs = m3u8_file.Parts.Count;
3333
var globalPartNumber = 0;
34-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
34+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
3535

3636
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
3737
{
@@ -145,7 +145,7 @@ private static IReadOnlyCollection< m3u8_part_ts > download_m3u8File_parallel__v
145145
var expectedPartNumber = parts.FirstOrDefault().OrderNumber;
146146
var maxPartNumber = parts.LastOrDefault ().OrderNumber;
147147
var sourceQueue = new Queue< m3u8_part_ts >( parts );
148-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
148+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
149149
var downloadPartsResult = new LinkedList< m3u8_part_ts >();
150150

151151
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
@@ -298,7 +298,7 @@ private static IEnumerable< m3u8_part_ts > download_m3u8File_parallel__v2( m3u8_
298298
var expectedPartNumber = m3u8_file.Parts.FirstOrDefault().OrderNumber;
299299
var maxPartNumber = m3u8_file.Parts.LastOrDefault ().OrderNumber;
300300
var sourceQueue = new Queue< m3u8_part_ts >( m3u8_file.Parts );
301-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
301+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
302302

303303
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
304304
using ( var canExtractPartEvent = new AutoResetEvent( false ) )

‎m3u8.console.app_2/Program.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ private static IReadOnlyCollection< m3u8_part_ts > download_m3u8File_parallel( m
3131
var baseAddress = m3u8_file.BaseAddress;
3232
var totalPatrs = m3u8_file.Parts.Count;
3333
var globalPartNumber = 0;
34-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
34+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
3535

3636
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
3737
{
@@ -145,7 +145,7 @@ private static IReadOnlyCollection< m3u8_part_ts > download_m3u8File_parallel__v
145145
var expectedPartNumber = parts.FirstOrDefault().OrderNumber;
146146
var maxPartNumber = parts.LastOrDefault ().OrderNumber;
147147
var sourceQueue = new Queue< m3u8_part_ts >( parts );
148-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
148+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
149149
var downloadPartsResult = new LinkedList< m3u8_part_ts >();
150150

151151
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
@@ -298,7 +298,7 @@ private static IEnumerable< m3u8_part_ts > download_m3u8File_parallel__v2( m3u8_
298298
var expectedPartNumber = m3u8_file.Parts.FirstOrDefault().OrderNumber;
299299
var maxPartNumber = m3u8_file.Parts.LastOrDefault ().OrderNumber;
300300
var sourceQueue = new Queue< m3u8_part_ts >( m3u8_file.Parts );
301-
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.comparer.Inst );
301+
var downloadPartsSet = new SortedSet< m3u8_part_ts >( m3u8_part_ts.Comparer.Inst );
302302

303303
using ( DefaultConnectionLimitSaver.Create( maxDegreeOfParallelism ) )
304304
using ( var canExtractPartEvent = new AutoResetEvent( false ) )

‎m3u8.download.manager/Avalonia/Properties/Resources.Designer.cs

+18
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎m3u8.download.manager/Avalonia/Properties/Resources.resx

+6
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@
120120
<data name="APP_TITLE" xml:space="preserve">
121121
<value>.m3u8 file download manager</value>
122122
</data>
123+
<data name="NET_FW" xml:space="preserve">
124+
<value>(NET 4.8.1)</value>
125+
</data>
126+
<data name="NET_CORE" xml:space="preserve">
127+
<value>(NET 8.0)</value>
128+
</data>
123129
<data name="M3U8_EXTENSION" xml:space="preserve">
124130
<value>.m3u8</value>
125131
</data>

‎m3u8.download.manager/Avalonia/VM/Commands/AboutCommand.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public async void Execute( object parameter )
2020
{
2121
const string CAPTION = "about";
2222

23-
var text = $"\"{(AssemblyInfoHelper.AssemblyTitle ?? "-")}\"" + Environment.NewLine +
23+
var text = $"\"{(AssemblyInfoHelper.AssemblyTitle ?? "-")}\" {AssemblyInfoHelper.FrameWorkName}" + Environment.NewLine +
2424
(AssemblyInfoHelper.AssemblyCopyright ?? "-") + Environment.NewLine +
2525
Environment.NewLine +
2626
$"Version {(AssemblyInfoHelper.AssemblyVersion ?? "-")}, ({(AssemblyInfoHelper.AssemblyLastWriteTime ?? "-")})" +

0 commit comments

Comments
 (0)