anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#263 rolling back webp conversion code

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-12-17 18:13:42 +03:30
parent 587dfc9787
commit f19f22438e
10 changed files with 2286 additions and 6198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
RMuseum/Controllers/ArtifactController.cs
View File

@ -1974,31 +1974,6 @@ namespace RMuseum.Controllers
return BadRequest(exp.ToString());
}
}
/// <summary>
/// convert original images to webp
/// </summary>
/// <returns></returns>
[HttpPost("webpconvert")]
[Authorize(Policy = RMuseumSecurableItem.ArtifactEntityShortName + ":" + RMuseumSecurableItem.ImportOperationShortName)]
[ProducesResponseType((int)HttpStatusCode.OK)]
[ProducesResponseType((int)HttpStatusCode.BadRequest, Type = typeof(string))]
[ProducesResponseType((int)HttpStatusCode.Unauthorized)]
public IActionResult StartConvertingOriginalImagesToWebp()
{
try
{
var res = _artifactService.StartConvertingOriginalImagesToWebp();
if (!string.IsNullOrEmpty(res.ExceptionString))
return BadRequest(res.ExceptionString);
return Ok();
}
catch (Exception exp)
{
return BadRequest(exp.ToString());
}
}
/// <summary>
/// readonly mode
/// </summary>

5
RMuseum/DbContext/RMuseumDbContext.cs
View File

@ -400,10 +400,5 @@ namespace RMuseum.DbContext
/// </summary>
public DbSet<RecitationErrorReport> RecitationErrorReports { get; set; }
/// <summary>
/// webp convertion log
/// </summary>
public DbSet<WebpConvertionLog> WebpConvertionLogs { get; set; }
}
}

3552
RMuseum/Migrations/20211217120953_WebpLogModel.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

47
RMuseum/Migrations/20211217120953_WebpLogModel.cs
View File

@ -1,47 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RMuseum.Migrations
{
public partial class WebpLogModel : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "WebpConvertionLogs",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
PictureId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
OriginalFileSizeInByte = table.Column<long>(type: "bigint", nullable: false),
StartTime = table.Column<DateTime>(type: "datetime2", nullable: false),
TargetFileSizeInByte = table.Column<long>(type: "bigint", nullable: false),
FinishTime = table.Column<DateTime>(type: "datetime2", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_WebpConvertionLogs", x => x.Id);
table.ForeignKey(
name: "FK_WebpConvertionLogs_GeneralImages_PictureId",
column: x => x.PictureId,
principalTable: "GeneralImages",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_WebpConvertionLogs_PictureId",
table: "WebpConvertionLogs",
column: "PictureId");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "WebpConvertionLogs");
}
}
}

4611
RMuseum/Migrations/RMuseumDbContextModelSnapshot.cs
View File

File diff suppressed because it is too large Load Diff

45
RMuseum/Models/Artifact/WebpConvertionLog.cs
View File

@ -1,45 +0,0 @@
using System;
namespace RMuseum.Models.Artifact
{
/// <summary>
/// webp convertion log
/// </summary>
public class WebpConvertionLog
{
/// <summary>
/// id
/// </summary>
public int Id { get; set; }
/// <summary>
/// picture id
/// </summary>
public Guid PictureId { get; set; }
/// <summary>
/// picture
/// </summary>
public RPictureFile Picture { get; set; }
/// <summary>
/// original file size
/// </summary>
public long OriginalFileSizeInByte { get; set; }
/// <summary>
/// start time
/// </summary>
public DateTime StartTime { get; set; }
/// <summary>
/// target file size
/// </summary>
public long TargetFileSizeInByte { get; set; }
/// <summary>
/// finish time
/// </summary>
public DateTime FinishTime { get; set; }
}
}

2
RMuseum/RMuseum.csproj
View File

@ -14,8 +14,6 @@
<ItemGroup>
<PackageReference Include="DNTPersianUtils.Core" Version="5.3.2" />
<PackageReference Include="ImageProcessor" Version="2.9.1" />
<PackageReference Include="ImageProcessor.Plugins.WebP" Version="1.3.0" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="6.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
<PrivateAssets>all</PrivateAssets>

66
RMuseum/RMuseum.xml
View File

@ -576,12 +576,6 @@
</summary>
<returns></returns>
</member>
<member name="M:RMuseum.Controllers.ArtifactController.StartConvertingOriginalImagesToWebp">
<summary>
convert original images to webp
</summary>
<returns></returns>
</member>
<member name="P:RMuseum.Controllers.ArtifactController.ReadOnlyMode">
<summary>
readonly mode
@ -2294,11 +2288,6 @@
recitation error reports
</summary>
</member>
<member name="P:RMuseum.DbContext.RMuseumDbContext.WebpConvertionLogs">
<summary>
webp convertion log
</summary>
</member>
<member name="T:RMuseum.Models.Accounting.DonationExpenditure">
<summary>
donation expenditures
@ -3172,46 +3161,6 @@
Item Friendly Url
</summary>
</member>
<member name="T:RMuseum.Models.Artifact.WebpConvertionLog">
<summary>
webp convertion log
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.Id">
<summary>
id
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.PictureId">
<summary>
picture id
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.Picture">
<summary>
picture
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.OriginalFileSizeInByte">
<summary>
original file size
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.StartTime">
<summary>
start time
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.TargetFileSizeInByte">
<summary>
target file size
</summary>
</member>
<member name="P:RMuseum.Models.Artifact.WebpConvertionLog.FinishTime">
<summary>
finish time
</summary>
</member>
<member name="T:RMuseum.Models.Auth.Memory.RMuseumSecurableItem">
<summary>
specific forms and permission
@ -9010,12 +8959,6 @@
<param name="id"></param>
<returns></returns>
</member>
<member name="M:RMuseum.Services.IArtifactService.StartConvertingOriginalImagesToWebp">
<summary>
convert original images to webp
</summary>
<returns></returns>
</member>
<member name="T:RMuseum.Services.IDonationService">
<summary>
donation service
@ -9990,15 +9933,6 @@
<summary>
IArtifactService implementation
</summary>
<summary>
IArtifactService implementation
</summary>
</member>
<member name="M:RMuseum.Services.Implementation.ArtifactService.StartConvertingOriginalImagesToWebp">
<summary>
convert original images to webp
</summary>
<returns></returns>
</member>
<member name="M:RMuseum.Services.Implementation.ArtifactService.StartFillingGanjoorLinkOriginalSources">
<summary>

8
RMuseum/Services/IArtifactService.cs
View File

@ -217,7 +217,7 @@ namespace RMuseum.Services
/// <param name="tagValueId"></param>
/// <returns></returns>
Task<RServiceResult<bool>> UnTagItem(Guid itemId, Guid tagValueId);
/// <summary>
@ -556,11 +556,5 @@ namespace RMuseum.Services
/// <returns></returns>
Task<RServiceResult<bool>> AcceptPublicNoteReport(Guid id);
/// <summary>
/// convert original images to webp
/// </summary>
/// <returns></returns>
RServiceResult<bool> StartConvertingOriginalImagesToWebp();
}
}

123
RMuseum/Services/Implementation/ArtifactService-Partials/ArtifactService-ConvertToWebp.cs
View File

@ -1,123 +0,0 @@
using ImageProcessor;
using ImageProcessor.Plugins.WebP.Imaging.Formats;
using Microsoft.EntityFrameworkCore;
using RMuseum.DbContext;
using RMuseum.Models.Artifact;
using RSecurityBackend.Models.Generic;
using RSecurityBackend.Services.Implementation;
using System;
using System.IO;
using System.Linq;
namespace RMuseum.Services.Implementation
{
/// <summary>
/// IArtifactService implementation
/// </summary>
public partial class ArtifactService : IArtifactService
{
/// <summary>
/// convert original images to webp
/// </summary>
/// <returns></returns>
public RServiceResult<bool> StartConvertingOriginalImagesToWebp()
{
_backgroundTaskQueue.QueueBackgroundWorkItem
(
async token =>
{
using (RMuseumDbContext context = new RMuseumDbContext(new DbContextOptions<RMuseumDbContext>())) //this is long running job, so _context might be already been freed/collected by GC
{
LongRunningJobProgressServiceEF jobProgressServiceEF = new LongRunningJobProgressServiceEF(context);
var job = (await jobProgressServiceEF.NewJob($"Converting Original Images To Webp", "Query data")).Result;
try
{
string imageStoragePath = $"{Configuration.GetSection("PictureFileService")["StoragePath"]}";
var artifacts = await context.Artifacts.Include(a => a.Items).ThenInclude(i => i.Images).AsNoTracking().ToArrayAsync();
int artifactNum = 0;
foreach (var artifact in artifacts)
{
await jobProgressServiceEF.UpdateJob(job.Id, ++artifactNum, $"{artifactNum} from {artifacts.Length} artifacts ({artifact.Name}) containing {artifact.ItemCount} items");
foreach (var item in artifact.Items)
{
foreach (var image in item.Images)
{
if(image.ContentType == "image/jpeg")
{
var imagePath = Path.Combine(imageStoragePath, image.FolderName, image.StoredFileName);
var webpPath = Path.Combine(imageStoragePath, image.FolderName, Path.GetDirectoryName(image.StoredFileName), $"{Path.GetFileNameWithoutExtension(image.StoredFileName)}.webp");
WebpConvertionLog log = null;
if (File.Exists(imagePath))
{
if (File.Exists(webpPath))
File.Delete(webpPath);
log = new WebpConvertionLog()
{
PictureId = image.Id,
StartTime = DateTime.Now,
OriginalFileSizeInByte = image.FileSizeInBytes
};
//convert to webp
using (ImageFactory imageFactory = new ImageFactory(preserveExifData: false))
{
imageFactory.Load(imagePath)
.Format(new WebPFormat())
.Quality(80)
.Save(webpPath);
}
}
if(File.Exists(webpPath))
{
//update db meta data
var imageInDb = await context.PictureFiles.Where(p => p.Id == image.Id).SingleAsync();
imageInDb.ContentType = "image/webp";
imageInDb.StoredFileName = imageInDb.StoredFileName.Replace(".jpg", ".webp", StringComparison.InvariantCultureIgnoreCase);
imageInDb.FileSizeInBytes = (await File.ReadAllBytesAsync(webpPath)).Length;
context.PictureFiles.Update(imageInDb);
if(log != null)
{
log.FinishTime = DateTime.Now;
log.TargetFileSizeInByte = imageInDb.FileSizeInBytes;
context.WebpConvertionLogs.Add(log);
}
await context.SaveChangesAsync();
if(File.Exists(imagePath))
{
try
{
File.Delete(imagePath);
}
catch
{
//ignore exception
}
}
}
}
}
}
}
await jobProgressServiceEF.UpdateJob(job.Id, 100, "", true);
}
catch (Exception exp)
{
await jobProgressServiceEF.UpdateJob(job.Id, 100, "", false, exp.ToString());
}
}
});
return new RServiceResult<bool>(true);
}
}
}