merge hotfix

.github/workflows/publish-stable.yml

@@ -11,38 +11,124 @@ jobs:
 
     strategy:
       matrix:
-        kind: ['linux', 'linuxselfcontained', 'macos', 'macosselfcontained', 'windows', 'windowsselfcontained']
+        kind: [
+          'linux-x86',
+          'linux-x64',
+          'linux-arm',
+          'linux-arm64',
+
+          'linux-selfcont-x86',
+          'linux-selfcont-x64',
+          'linux-selfcont-arm',
+          'linux-selfcont-arm64',
+
+          'macos-x64',
+          'macos-arm64',
+
+          'macos-selfcont-x64',
+          'macos-selfcont-arm64',
+
+          'windows-x86',
+          'windows-x64',
+          'windows-arm',
+          'windows-arm64',
+
+          'windows-selfcont-x86',
+          'windows-selfcont-x64',
+          'windows-selfcont-arm',
+          'windows-selfcont-arm64']
         include:
-          - kind: linux
+          - kind: linux-x86
+            os: ubuntu-latest
+            target: linux-x86
+            frameworktype: --no-self-contained
+          - kind: linux-x64
             os: ubuntu-latest
             target: linux-x64
             frameworktype: --no-self-contained
-          - kind: linuxselfcontained
+          - kind: linux-arm
+            os: ubuntu-latest
+            target: linux-arm
+            frameworktype: --no-self-contained
+          - kind: linux-arm64
+            os: ubuntu-latest
+            target: linux-arm64
+            frameworktype: --no-self-contained
+
+          - kind: linux-selfcont-x86
+            os: ubuntu-latest
+            target: linux-x86
+            frameworktype: --self-contained
+          - kind: linux-selfcont-x64
             os: ubuntu-latest
             target: linux-x64
             frameworktype: --self-contained
-          - kind: macos
+          - kind: linux-selfcont-arm
+            os: ubuntu-latest
+            target: linux-arm
+            frameworktype: --self-contained
+          - kind: linux-selfcont-arm64
+            os: ubuntu-latest
+            target: linux-arm64
+            frameworktype: --self-contained
+
+          - kind: macos-x64
             os: macOS-latest
             target: osx-x64
             frameworktype: --no-self-contained
-          - kind: macosselfcontained
+          - kind: macos-arm64
+            os: macOS-latest
+            target: osx-arm64
+            frameworktype: --no-self-contained
+
+          - kind: macos-selfcont-x64
             os: macOS-latest
             target: osx-x64
             frameworktype: --self-contained
-          - kind: windows
+          - kind: macos-selfcont-arm64
+            os: macOS-latest
+            target: osx-arm64
+            frameworktype: --self-contained
+
+          - kind: windows-x86
+            os: windows-latest
+            target: win-x86
+            frameworktype: --no-self-contained
+          - kind: windows-x64
             os: windows-latest
             target: win-x64
             frameworktype: --no-self-contained
-          - kind: windowsselfcontained
+          - kind: windows-arm
+            os: windows-latest
+            target: win-arm
+            frameworktype: --no-self-contained
+          - kind: windows-arm64
+            os: windows-latest
+            target: win-arm64
+            frameworktype: --no-self-contained
+
+          - kind: windows-selfcont-x86
+            os: windows-latest
+            target: win-x86
+            frameworktype: --self-contained
+          - kind: windows-selfcont-x64
             os: windows-latest
             target: win-x64
             frameworktype: --self-contained
+          - kind: windows-selfcont-arm
+            os: windows-latest
+            target: win-arm
+            frameworktype: --self-contained
+          - kind: windows-selfcont-arm64
+            os: windows-latest
+            target: win-arm64
+            frameworktype: --self-contained
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -59,7 +145,7 @@ jobs:
           # Build everything
           dotnet publish src/EthernaVideoImporter/EthernaVideoImporter.csproj --runtime "${{ matrix.target }}" "${{ matrix.frameworktype }}" -c Release -o "$release_name"
           # Pack files
-          if [ "${{ matrix.target }}" == "win-x64" ]; then
+          if [ "${{ matrix.kind }}" == windows* ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
           else
             tar czvf "${release_name}.tar.gz" "$release_name"
@@ -73,7 +159,7 @@ jobs:
           # Build everything
           dotnet publish src/EthernaVideoImporter.Devcon/EthernaVideoImporter.Devcon.csproj --runtime "${{ matrix.target }}" "${{ matrix.frameworktype }}" -c Release -o "$release_name"
           # Pack files
-          if [ "${{ matrix.target }}" == "win-x64" ]; then
+          if [ "${{ matrix.kind }}" == windows* ]; then
             7z a -tzip "${release_name}.zip" "./${release_name}/*"
           else
             tar czvf "${release_name}.tar.gz" "$release_name"

EthernaVideoImporter.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		README.md = README.md
+		.gitignore = .gitignore
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1E5D1B5B-4926-4F7F-97A9-19DAE5065550}"

EthernaVideoImporter.sln.DotSettings

@@ -1,5 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2022-present Etherna Sagl
+	<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">  Copyright 2022-present Etherna SA
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=etherna/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fmpeg/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Fprobe/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sagl/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+</wpf:ResourceDictionary>

README.md

@@ -35,7 +35,7 @@ General Options:
 Video Management Options:
   -t, --ttl               TTL (days) Postage Stamp (default: 365 days)
   -o, --offer             Offer video downloads to everyone
-  -p, --pin               Pin videos
+  --no-pin                Don't pin videos (pinning by default)
   --force                 Force upload video if they already have been uploaded
   -m, --remove-missing    Remove indexed videos generated with this tool but missing from source
   --remove-unrecognized   Remove indexed videos not generated with this tool
@@ -90,7 +90,7 @@ General Options:
 Video Management Options:
   -t, --ttl               TTL (days) Postage Stamp (default: 365 days)
   -o, --offer             Offer video downloads to everyone
-  -p, --pin               Pin videos
+  --no-pin                Don't pin videos (pinning by default)
   --force                 Force upload video if they already have been uploaded
   -m, --remove-missing    Remove indexed videos generated with this tool but missing from source
   --remove-unrecognized   Remove indexed videos not generated with this tool

src/EthernaVideoImporter.Core/CommonConsts.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
@@ -25,8 +25,8 @@ public sealed class CommonConsts
         public const int BeeApiPort = 1633;
         public const int BeeDebugPort = 1635;
         public const string BeeNodeUrl = "http://localhost/";
-        public const GatewayApiVersion BeeNodeGatewayVersion = GatewayApiVersion.v4_0_0;
-        public const DebugApiVersion BeeNodeDebugVersion = DebugApiVersion.v4_0_0;
+        public const GatewayApiVersion BeeNodeGatewayVersion = GatewayApiVersion.v5_0_0;
+        public const DebugApiVersion BeeNodeDebugVersion = DebugApiVersion.v5_0_0;
         public static readonly string DefaultFFmpegFolder = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "FFmpeg");
         public const int DownloadMaxRetry = 3;
         public static readonly TimeSpan DownloadTimespanRetry = TimeSpan.FromMilliseconds(3500);

src/EthernaVideoImporter.Core/EthernaVersionControl.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/EthernaVideoImporter.Core.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <RootNamespace>Etherna.VideoImporter.Core</RootNamespace>
 
-    <Authors>Etherna Sagl</Authors>
+    <Authors>Etherna SA</Authors>
     <Description>A .Net console for upload video on Etherna</Description>
 
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -23,9 +23,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.193" />
+    <PackageReference Include="Bee.Net" Version="0.2.0-alpha.210" />
     <PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
-    <PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.8" />
+    <PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.9" />
     <PackageReference Include="EthernaServicesClient.Users.Native" Version="0.3.2" />
     <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
       <PrivateAssets>all</PrivateAssets>
@@ -40,7 +40,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.5" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
   </ItemGroup>
 
   <ItemGroup>

src/EthernaVideoImporter.Core/EthernaVideoImporter.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Extensions/StringExtensions.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/IEthernaVideoImporter.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/AudioSourceFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/AudioSwarmFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/FileBase.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/IFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/IThumbnailFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/IVideoFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/SourceFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/SourceUri.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/SourceUriKind.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/SwarmFileBase.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/SwarmVideoMetadata.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/ThumbnailSourceFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/ThumbnailSwarmFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/Video.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/VideoMetadataBase.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/VideoSourceFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/VideoSwarmFile.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/Domain/YouTubeVideoMetadataBase.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.

src/EthernaVideoImporter.Core/Models/FFmpegDto/FFProbeResultDto.cs

@@ -1,4 +1,4 @@
-//   Copyright 2022-present Etherna Sagl
+//   Copyright 2022-present Etherna SA
 // 
 //   Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.