ft/skyscraper8
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Began working on the salvager.
All checks were successful
🚀 Pack skyscraper8 / make-zip (push) Successful in 47s
Details

Browse Source
This commit is contained in:
feyris-tan 2026-05-16 20:59:46 +02:00
parent 67bc722c66
commit 92056f4ce3
8 changed files with 394 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
skyscraper8.Tests/ResourceTests/NtbuDoabiliyTest.cs
View File

@ -1,36 +0,0 @@
using System.IO;
using System.Net.NetworkInformation;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using skyscraper5.Skyscraper.IO;
namespace skyscraper8.Tests.ResourceTests;
[TestClass]
public class NtbuDoability
{
[TestMethod]
public void DecodeUnifiInform()
{
byte[] bytes = Resources1.ubnt;
MemoryStream stream = new MemoryStream(bytes,false);
if (stream.ReadUInt32BE() != 1414414933u)
Assert.Fail();
if (stream.ReadUInt32BE() != 0)
Assert.Fail();
PhysicalAddress apMac = new PhysicalAddress(stream.ReadBytes(6));
ushort flags = stream.ReadUInt16BE();
bool encrypted = (flags & 0x0001) != 0;
bool zlib = (flags & 0x0002) != 0;
bool snappy = (flags & 0x0004) != 0;
bool aesGcm = (flags & 0x0008) != 0;
byte[] iv = stream.ReadBytes(16);
uint dataVersion = stream.ReadUInt32BE();
uint payloadLength = stream.ReadUInt32BE();
byte[] payload = stream.ReadBytes(payloadLength);
}
}

255
skyscraper8.Tests/Resources1.Designer.cs generated
View File

@ -1,9 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Dieser Code wurde von einem Tool generiert.
// Laufzeitversion:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
// der Code erneut generiert wird.
// </auto-generated>
//------------------------------------------------------------------------------
@ -11,32 +12,46 @@ namespace skyscraper8.Tests {
using System;
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[System.Diagnostics.DebuggerNonUserCodeAttribute()]
[System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
/// <summary>
/// Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
/// </summary>
// Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
// -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
// Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
// mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources1 {
private static System.Resources.ResourceManager resourceMan;
private static global::System.Resources.ResourceManager resourceMan;
private static System.Globalization.CultureInfo resourceCulture;
private static global::System.Globalization.CultureInfo resourceCulture;
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
[global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal Resources1() {
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Resources.ResourceManager ResourceManager {
/// <summary>
/// Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Resources.ResourceManager ResourceManager {
get {
if (object.Equals(null, resourceMan)) {
System.Resources.ResourceManager temp = new System.Resources.ResourceManager("skyscraper8.Tests.Resources1", typeof(Resources1).Assembly);
if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("skyscraper8.Tests.Resources1", typeof(Resources1).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
internal static System.Globalization.CultureInfo Culture {
/// <summary>
/// Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
/// Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@ -45,83 +60,9 @@ namespace skyscraper8.Tests {
}
}
internal static byte[] ModemCapabilitiesEncodingTest {
get {
object obj = ResourceManager.GetObject("ModemCapabilitiesEncodingTest", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] MultipartRegistrationResponseTest {
get {
object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] PushMacManagementMessage_Version4_Type45 {
get {
object obj = ResourceManager.GetObject("PushMacManagementMessage_Version4_Type45", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] ranging_response_test {
get {
object obj = ResourceManager.GetObject("ranging_response_test", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] MultipartRegistrationResponseTest2 {
get {
object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest2", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] test_1packet_01 {
get {
object obj = ResourceManager.GetObject("test-1packet-01", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] test_2packets_02_03 {
get {
object obj = ResourceManager.GetObject("test-2packets-02-03", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] test_3packets_04_05_06 {
get {
object obj = ResourceManager.GetObject("test-3packets-04-05-06", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] TransmitChannelConfigurationObject {
get {
object obj = ResourceManager.GetObject("TransmitChannelConfigurationObject", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] UpstreamChannelDescriptorTest {
get {
object obj = ResourceManager.GetObject("UpstreamChannelDescriptorTest", resourceCulture);
return ((byte[])(obj));
}
}
internal static byte[] Frame00001343_TSGS1_MIS000_SYNC001 {
get {
object obj = ResourceManager.GetObject("Frame00001343_TSGS1_MIS000_SYNC001", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] Frame00000008_TSGS1_MIS000_SYNC001 {
get {
object obj = ResourceManager.GetObject("Frame00000008_TSGS1_MIS000_SYNC001", resourceCulture);
@ -129,6 +70,9 @@ namespace skyscraper8.Tests {
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] Frame00000012_TSGS1_MIS000_SYNC001 {
get {
object obj = ResourceManager.GetObject("Frame00000012_TSGS1_MIS000_SYNC001", resourceCulture);
@ -136,13 +80,9 @@ namespace skyscraper8.Tests {
}
}
internal static byte[] sdpTest {
get {
object obj = ResourceManager.GetObject("sdpTest", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] Frame00000357_TSGS1_MIS000_SYNC184 {
get {
object obj = ResourceManager.GetObject("Frame00000357_TSGS1_MIS000_SYNC184", resourceCulture);
@ -150,9 +90,122 @@ namespace skyscraper8.Tests {
}
}
internal static byte[] ubnt {
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] Frame00001343_TSGS1_MIS000_SYNC001 {
get {
object obj = ResourceManager.GetObject("ubnt", resourceCulture);
object obj = ResourceManager.GetObject("Frame00001343_TSGS1_MIS000_SYNC001", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] ModemCapabilitiesEncodingTest {
get {
object obj = ResourceManager.GetObject("ModemCapabilitiesEncodingTest", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] MultipartRegistrationResponseTest {
get {
object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] MultipartRegistrationResponseTest2 {
get {
object obj = ResourceManager.GetObject("MultipartRegistrationResponseTest2", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] PushMacManagementMessage_Version4_Type45 {
get {
object obj = ResourceManager.GetObject("PushMacManagementMessage_Version4_Type45", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] ranging_response_test {
get {
object obj = ResourceManager.GetObject("ranging_response_test", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] sdpTest {
get {
object obj = ResourceManager.GetObject("sdpTest", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] test_1packet_01 {
get {
object obj = ResourceManager.GetObject("test-1packet-01", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] test_2packets_02_03 {
get {
object obj = ResourceManager.GetObject("test-2packets-02-03", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] test_3packets_04_05_06 {
get {
object obj = ResourceManager.GetObject("test-3packets-04-05-06", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] TransmitChannelConfigurationObject {
get {
object obj = ResourceManager.GetObject("TransmitChannelConfigurationObject", resourceCulture);
return ((byte[])(obj));
}
}
/// <summary>
/// Sucht eine lokalisierte Ressource vom Typ System.Byte[].
/// </summary>
internal static byte[] UpstreamChannelDescriptorTest {
get {
object obj = ResourceManager.GetObject("UpstreamChannelDescriptorTest", resourceCulture);
return ((byte[])(obj));
}
}

3
skyscraper8.Tests/Resources1.resx
View File

@ -163,7 +163,4 @@
<data name="Frame00000357_TSGS1_MIS000_SYNC184" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\Frame00000357_TSGS1_MIS000_SYNC184.bbframe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="ubnt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\ubnt.bin;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>

9
skyscraper8.Tests/skyscraper8.Tests.csproj.user Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
<ItemGroup>
<EmbeddedResource Update="Resources1.resx">
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
</Project>

14
skyscraper8/Program.cs
View File

@ -406,6 +406,13 @@ namespace skyscraper5
rotator.Run();
return;
}
if (args[0].ToLowerInvariant().Equals("salvage"))
{
Salvager salvager = new Salvager();
salvager.Run(args);
return;
}
}
/*Passing passing = new Passing();
@ -435,6 +442,13 @@ namespace skyscraper5
Console.WriteLine(".\\skyscraper8.exe shannon \"C:\\some\\file.bmp\" - calculates the Shannon entropy value for any given file.");
Console.WriteLine(".\\skyscraper8.exe make-catalogue \"C:\\path\\to\\ts\\collection\\\" \"C:\\outputted_index.csv\" - generates a catalogue with core information about your TS files.");
Console.WriteLine(".\\skyscraper8.exe pts2bbf2 \"C:\\path\\to\\file.ts\\\" - extracts every single BBFrame from a GS to into a small file for each. (be careful, might generate many small files!)");
Console.WriteLine(".\\skyscraper8.exe salvage strategyName \"C:\\path\\to\\file.ts\\\" - attempts to salvage a corrupted TS.)");
Console.WriteLine();
Console.WriteLine("Salvaging strategy names:");
Console.WriteLine(" s1 - Stay aligned with 188-bytes, but skip blocks which do not feature the 0x49 sync byte.");
Console.WriteLine(" s2 - Stay aligned with 188-bytes, but pretends the sync byte is valid even if it isn't.");
Console.WriteLine(" s3 - Ignore 188-byte alignment. When the sync-byte is not found after a packet, seek the stream forward until something is found that *might* sync.");
Console.WriteLine(" Note that the salvaging feature needs the first packet to be valid.");
}
private static void ToggleSubTsDumpConfiguration(bool enabled)

2
skyscraper8/Properties/launchSettings.json
View File

@ -2,7 +2,7 @@
"profiles": {
"skyscraper8": {
"commandName": "Project",
"commandLineArgs": "F:\\alpha\\2026-03\\reuters-telstar-session3\\reuters3.m3u8",
"commandLineArgs": "salvage s1 \"C:\\devel\\skyscraper8-testsuite\\105.5E_4169.263_H_5237_(2026-04-24 12.36.13)_dump.ts\"",
"remoteDebugEnabled": false
},
"Container (Dockerfile)": {

116
skyscraper8/Skyscraper/IO/UnseekableInputStream.cs Normal file
View File

@ -0,0 +1,116 @@
using log4net;
using skyscraper5.src.InteractionChannel.Model;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace skyscraper8.Skyscraper.IO
{
internal class UnseekableInputStream : Stream
{
private readonly Stream _wrappedStream;
private bool _lengthSupported;
private bool _positionSupported;
private readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
private long emulatedPosition;
public UnseekableInputStream(Stream wrappedStream)
{
_wrappedStream = wrappedStream;
try
{
long length = wrappedStream.Length;
logger.DebugFormat("Wrapping a Stream of {0} bytes in an unseekable container.", length);
_lengthSupported = true;
}
catch (Exception e)
{
_lengthSupported = false;
}
try
{
long position = wrappedStream.Position;
logger.DebugFormat("Current stream position: {0}", position);
_positionSupported = true;
}
catch (Exception e)
{
_positionSupported = false;
}
}
public override void Flush()
{
throw new NotSupportedException();
}
public override int Read(byte[] buffer, int offset, int count)
{
int result = _wrappedStream.Read(buffer, offset, count);
if (!_positionSupported)
{
emulatedPosition += result;
}
return result;
}
public override long Seek(long offset, SeekOrigin origin)
{
throw new NotSupportedException();
}
public override void SetLength(long value)
{
throw new NotSupportedException();
}
public override void Write(byte[] buffer, int offset, int count)
{
throw new NotSupportedException();
}
public override bool CanRead => _wrappedStream.CanRead;
public override bool CanSeek => false;
public override bool CanWrite => false;
public override long Length
{
get
{
if (_lengthSupported)
{
return _wrappedStream.Length;
}
else
{
throw new NotSupportedException();
}
}
}
public override long Position
{
get
{
if (_positionSupported)
{
return _wrappedStream.Position;
}
else
{
return emulatedPosition;
}
}
set
{
throw new NotImplementedException();
}
}
}
}

100
skyscraper8/Skyscraper/Salvager.cs Normal file
View File

@ -0,0 +1,100 @@
using log4net;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Sockets;
using System.Text;
using System.Threading.Tasks;
using skyscraper5.Mpeg2;
using skyscraper5.Skyscraper.Scraper;
using skyscraper5.Skyscraper.Scraper.Storage.Filesystem;
using skyscraper5.Skyscraper.Scraper.Storage.InMemory;
using skyscraper8.Skyscraper.Scraper.Storage;
namespace skyscraper8.Skyscraper
{
internal class Salvager
{
private static readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
public void Run(string[] args)
{
if (args.Length != 3)
{
Console.WriteLine("specify the salvaging strategy and the source.");
return;
}
switch (args[1])
{
case "s1": Strategy = SalvagingStrategy.IgnorePacketsWithWrongSyncByte; break;
case "s2": Strategy = SalvagingStrategy.PatchSyncByte; break;
case "s3": Strategy = SalvagingStrategy.SeekForSyncByte; break;
default:
{
logger.Fatal("\"{0}\" is not a known salvaging strategy.");
return;
}
}
FileInfo fi = new FileInfo(args[2]);
if (fi.Exists)
{
InputStream = fi.OpenRead();
}
else
{
var uri = new Uri("tcp://177.20.20.69:6969", UriKind.Absolute);
if (uri.Scheme.Equals("tcp"))
{
string host = uri.Host; // "177.20.20.69"
int port = uri.Port; // 6969
TcpClient tcpClient = new TcpClient(host, port);
InputStream = tcpClient.GetStream();
}
else
{
logger.FatalFormat("URI Scheme \"{0}\" is not supported for salvaging.", uri.Scheme);
return;
}
}
if (InputStream == null)
{
logger.FatalFormat("{0} is not a file that exist, and doesn't fit to any known URL scheme.");
return;
}
Run();
}
private void Run()
{
TsContext mpeg2 = new TsContext();
InMemoryScraperStorage dataStorage = new InMemoryScraperStorage();
FilesystemStorage objectStorage = new FilesystemStorage(new DirectoryInfo("."));
Context = new SkyscraperContext(mpeg2, dataStorage, objectStorage);
switch (Strategy)
{
default:
logger.ErrorFormat("I'm sorry, but the strategy \"{0}\" is not yet fully implemented.",Strategy);
return;
}
}
public SalvagingStrategy Strategy { get; set; }
public Stream InputStream { get; set; }
public SkyscraperContext Context { get; set; }
}
public enum SalvagingStrategy
{
IgnorePacketsWithWrongSyncByte,
PatchSyncByte,
SeekForSyncByte
}
}