Skip to content

Commit 9c5a8ca

Browse files
committed
Revertir a WTelegramClient NuGet oficial + ordenar carpetas alfabéticamente en DdTree
1 parent b4b9fe8 commit 9c5a8ca

7 files changed

Lines changed: 16 additions & 38 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212

1313
steps:
1414
- uses: actions/checkout@v4
15-
with:
16-
submodules: recursive
1715

1816
- name: Generate version
1917
id: version
@@ -36,7 +34,7 @@ jobs:
3634
run: |
3735
VERSION=${{ steps.version.outputs.version }}
3836
echo "Building full image with FFmpeg support..."
39-
docker build . -f ./TelegramDownloader/Dockerfile \
37+
docker build ./TelegramDownloader -f ./TelegramDownloader/Dockerfile \
4038
--build-arg VERSION=$VERSION \
4139
--build-arg INCLUDE_FFMPEG=true \
4240
--tag ghcr.io/mateof/telegramfilemanager:dev_$VERSION \
@@ -48,7 +46,7 @@ jobs:
4846
run: |
4947
VERSION=${{ steps.version.outputs.version }}
5048
echo "Building lite image without FFmpeg..."
51-
docker build . -f ./TelegramDownloader/Dockerfile \
49+
docker build ./TelegramDownloader -f ./TelegramDownloader/Dockerfile \
5250
--build-arg VERSION=$VERSION \
5351
--build-arg INCLUDE_FFMPEG=false \
5452
--tag ghcr.io/mateof/telegramfilemanager:dev_$VERSION-lite \

.github/workflows/release-docker-image.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ jobs:
1919

2020
steps:
2121
- uses: actions/checkout@v4
22-
with:
23-
submodules: recursive
2422

2523
- name: Extract version from tag
2624
id: version
@@ -44,7 +42,7 @@ jobs:
4442
run: |
4543
VERSION=${{ steps.version.outputs.version }}
4644
echo "Building full image with FFmpeg support..."
47-
docker build . -f ./TelegramDownloader/Dockerfile \
45+
docker build ./TelegramDownloader -f ./TelegramDownloader/Dockerfile \
4846
--build-arg VERSION=$VERSION \
4947
--build-arg INCLUDE_FFMPEG=true \
5048
--tag ghcr.io/mateof/telegramfilemanager:${{github.ref_name}} \
@@ -56,7 +54,7 @@ jobs:
5654
run: |
5755
VERSION=${{ steps.version.outputs.version }}
5856
echo "Building lite image without FFmpeg..."
59-
docker build . -f ./TelegramDownloader/Dockerfile \
57+
docker build ./TelegramDownloader -f ./TelegramDownloader/Dockerfile \
6058
--build-arg VERSION=$VERSION \
6159
--build-arg INCLUDE_FFMPEG=false \
6260
--tag ghcr.io/mateof/telegramfilemanager:${{github.ref_name}}-lite \

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

TelegramDownloader/Dockerfile

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,15 @@ FROM mcr.microsoft.com/dotnet/sdk:10.0-alpine AS build
2222
ARG BUILD_CONFIGURATION=Release
2323
ARG VERSION=0.0.0.0
2424
WORKDIR /src
25-
26-
# Copy submodule (WTelegramClient) first
27-
COPY ["libs/WTelegramClient/src/WTelegramClient.csproj", "libs/WTelegramClient/src/"]
28-
COPY ["libs/WTelegramClient/generator/MTProtoGenerator.csproj", "libs/WTelegramClient/generator/"]
29-
30-
# Copy main project
31-
COPY ["TelegramDownloader/TelegramDownloader.csproj", "TelegramDownloader/"]
32-
33-
# Restore all projects
34-
RUN dotnet restore "TelegramDownloader/TelegramDownloader.csproj"
35-
36-
# Copy all source files
37-
COPY libs/WTelegramClient/ libs/WTelegramClient/
38-
COPY TelegramDownloader/ TelegramDownloader/
39-
40-
WORKDIR "/src/TelegramDownloader"
25+
COPY ["TelegramDownloader.csproj", "."]
26+
RUN dotnet restore "TelegramDownloader.csproj"
27+
COPY . .
28+
WORKDIR "/src/."
4129
RUN dotnet build "./TelegramDownloader.csproj" -c $BUILD_CONFIGURATION -o /app/build
4230

4331
FROM build AS publish
4432
ARG BUILD_CONFIGURATION=Release
4533
ARG VERSION=0.0.0.0
46-
WORKDIR "/src/TelegramDownloader"
4734
RUN dotnet publish "./TelegramDownloader.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false,InformationalVersion=$VERSION
4835

4936
FROM base AS final
@@ -53,7 +40,7 @@ WORKDIR /app
5340
RUN apk add --no-cache python3 py3-pip && \
5441
ln -sf /usr/bin/python3 /usr/bin/python
5542

56-
COPY TelegramDownloader/WebDav /app/WebDav
43+
COPY ./WebDav /app/WebDav
5744

5845
# Create venv and install dependencies in single layer
5946
RUN python3 -m venv /app/venv && \
@@ -64,4 +51,4 @@ RUN python3 -m venv /app/venv && \
6451
ENV PATH="/app/venv/bin:${PATH}"
6552

6653
COPY --from=publish /app/publish .
67-
ENTRYPOINT ["dotnet", "TelegramDownloader.dll"]
54+
ENTRYPOINT ["dotnet", "TelegramDownloader.dll"]

TelegramDownloader/Shared/Ddtree.razor

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@
8686
}
8787
}
8888

89-
return Task.FromResult(result);
89+
// Sort alphabetically ascending
90+
return Task.FromResult(result.OrderBy(x => x.Name).ToList());
9091
}
9192

9293
private async Task<List<TreeNodeModel>> LoadTelegramFolders(string dbName, string parentId)
@@ -115,7 +116,8 @@
115116
HasChildren = f.HasChild
116117
});
117118
}
118-
return result;
119+
// Sort alphabetically ascending
120+
return result.OrderBy(x => x.Name).ToList();
119121
}
120122

121123
private async Task OnFolderSelected(string value)

TelegramDownloader/TelegramDownloader.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
44
<Version>3.4.0.0</Version>
@@ -34,10 +34,7 @@
3434
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
3535
<PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="29.2.11" />
3636
<PackageReference Include="System.IO.Hashing" Version="10.0.1" />
37-
<!-- WTelegramClient personalizado con optimizaciones de transferencia (submodule) -->
38-
<ProjectReference Include="..\libs\WTelegramClient\src\WTelegramClient.csproj" />
39-
<!-- Para volver a NuGet oficial, comenta la línea anterior y descomenta esta: -->
40-
<!-- <PackageReference Include="WTelegramClient" Version="4.3.14" /> -->
37+
<PackageReference Include="WTelegramClient" Version="4.3.14" />
4138
</ItemGroup>
4239

4340
<ItemGroup>

libs/WTelegramClient

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)