Skip to content

Commit

Permalink
merge hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
tmm360 committed Apr 15, 2024
2 parents fd18694 + 9b478e6 commit 31e6d69
Show file tree
Hide file tree
Showing 110 changed files with 2,445 additions and 1,775 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ jobs:
fetch-depth: 0

- name: Setup dotnet
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

- name: Build EthernaVideoImporter project
shell: bash
Expand Down
21 changes: 11 additions & 10 deletions EthernaVideoImporter.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<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 SA
<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.
You may obtain a copy of the License at
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</s:String>
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Dtos/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=etherna/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/UserDictionary/Words/=Fmpeg/@EntryIndexedValue">True</s:Boolean>
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Currently exists two versions:
* `EthernaVideoImporter` for a generic use
* `EthernaVideoImporter.Devcon` to import specifically Devcon Archive's videos

Etherna Video Importer requires at least [.NET 7 Runtime](https://dotnet.microsoft.com/download/dotnet/7.0) and [ASP.NET Core 7 Runtime](https://dotnet.microsoft.com/download/dotnet/7.0) installed on local machine to run, or it needs the `selfcontained` version of package, that already contains framework dependencies.
Etherna Video Importer requires at least [.NET 8 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0) and [ASP.NET Core 8 Runtime](https://dotnet.microsoft.com/download/dotnet/8.0) installed on local machine to run, or it needs the `selfcontained` version of package, that already contains framework dependencies.

### Setup FFmpeg and FFprobe
To run the importer you need to download [FFmpeg and FFprobe](https://ffmpeg.org/download.html) locally, and copy them into the default folder "\FFmpeg", or specify its location with arguments.
Expand All @@ -19,18 +19,18 @@ To run the importer you need to download [FFmpeg and FFprobe](https://ffmpeg.org

**EthernaVideoImporter's help**
```
Usage: evi COMMAND SOURCE_URI [OPTIONS]
Usage: evi COMMAND SOURCE_URI [SOURCE_URI, ...] [OPTIONS]
Commands:
json Import from json video list (requires metadata descriptor, see below)
youtube-channel Import from a YouTube channel
youtube-video Import from a YouTube video
json Import from json video list (requires metadata descriptor, see below)
youtube Import from multiple YouTube links. Supports videos, channels and playlists urls
General Options:
-k, --api-key Api Key (optional)
-f, --ffmpeg-path Path to FFmpeg folder (default: search to <app_dir>/FFmpeg or global install)
-i, --ignore-update Ignore new version of EthernaVideoImporter
-a, --auto-purchase Accept automatically purchase of all batches
-w, --write-file Write published videos result to a JSON file
Video Management Options:
-t, --ttl TTL (days) Postage Stamp (default: 365 days)
Expand All @@ -40,6 +40,7 @@ Video Management Options:
-m, --remove-missing Remove indexed videos generated with this tool but missing from source
--remove-unrecognized Remove indexed videos not generated with this tool
-u, --unpin Try to unpin contents removed from index
-c, --preset-codec Preset of codec used for encoder (see ffmpeg documentation). Default: medium
Bee Node Options:
--bee-node Use bee native node
Expand Down Expand Up @@ -95,6 +96,7 @@ Video Management Options:
-m, --remove-missing Remove indexed videos generated with this tool but missing from source
--remove-unrecognized Remove indexed videos not generated with this tool
-u, --unpin Try to unpin contents removed from index
-c, --preset-codec Preset of codec used for encoder (ultrafast, superfast, fast, medium, slow, slower) default: medium
Bee Node Options:
--bee-node Use bee native node
Expand Down
27 changes: 10 additions & 17 deletions src/EthernaVideoImporter.Core/CommonConsts.cs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
// Copyright 2022-present Etherna SA
// 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.
// You may obtain a copy of the License at
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

using Etherna.BeeNet.Clients.DebugApi;
using Etherna.BeeNet.Clients.GatewayApi;
Expand All @@ -25,19 +25,12 @@ 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.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);
public const string EthereumNullAddress = "0x0000000000000000000000000000000000000000";
public const string EthernaCreditUrl = "https://credit.etherna.io/";
public const string EthernaIndexUrl = "https://index.etherna.io/";
public const string EthernaIndexContentUrlPrefix = "https://etherna.io/embed/";
public const int EthernaGatewayPort = 443;
public const string EthernaGatewayUrl = "https://gateway.etherna.io/";
public const string EthernaPermalinkContentUrlPrefix = "https://etherna.io/embed/";
public const string EthernaServicesClientName = "ethernaServicesClient";
public const string EthernaSsoUrl = "https://sso.etherna.io/";
public const string EthernaVideoImporterClientId = "ethernaVideoImporterId";
public static string FFmpegBinaryName
Expand Down
96 changes: 0 additions & 96 deletions src/EthernaVideoImporter.Core/EthernaVersionControl.cs

This file was deleted.

18 changes: 9 additions & 9 deletions src/EthernaVideoImporter.Core/EthernaVideoImporter.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Etherna.VideoImporter.Core</RootNamespace>

<Authors>Etherna SA</Authors>
Expand All @@ -23,24 +23,24 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bee.Net" Version="0.2.0-alpha.210" />
<PackageReference Include="Bee.Net" Version="0.2.0-alpha.239" />
<PackageReference Include="Blurhash.SkiaSharp" Version="2.0.0" />
<PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.9" />
<PackageReference Include="EthernaServicesClient.Users.Native" Version="0.3.2" />
<PackageReference Include="Etherna.YoutubeDownloader.Converter" Version="6.3.10" />
<PackageReference Include="EthernaSdk.Users.Native" Version="0.4.0-alpha.29" />
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Keccak256" Version="1.0.0" />
<PackageReference Include="MedallionShell" Version="1.6.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading

0 comments on commit 31e6d69

Please sign in to comment.