Browse Source

1) Logging simplified

2) File version fixed
pull/65/head
Sebastian Stehle 9 years ago
parent
commit
fa18f5b4ff
  1. 20
      src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs
  2. 4
      src/Squidex.Write/Assets/AssetCommandHandler.cs
  3. 7
      src/Squidex.Write/Assets/AssetDomainObject.cs
  4. 4
      tests/Squidex.Write.Tests/Assets/AssetDomainObjectTests.cs

20
src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs

@ -7,7 +7,6 @@
// ========================================================================== // ==========================================================================
using System; using System;
using System.Text;
// ReSharper disable SwitchStatementMissingSomeCases // ReSharper disable SwitchStatementMissingSomeCases
@ -16,7 +15,6 @@ namespace Squidex.Infrastructure.Log.Internal
public class AnsiLogConsole : IConsole public class AnsiLogConsole : IConsole
{ {
private readonly bool logToStdError; private readonly bool logToStdError;
private readonly StringBuilder outputBuilder = new StringBuilder();
public AnsiLogConsole(bool logToStdError) public AnsiLogConsole(bool logToStdError)
{ {
@ -25,23 +23,9 @@ namespace Squidex.Infrastructure.Log.Internal
public void WriteLine(SemanticLogLevel level, string message) public void WriteLine(SemanticLogLevel level, string message)
{ {
if (level >= SemanticLogLevel.Error) if (level >= SemanticLogLevel.Error && logToStdError)
{ {
outputBuilder.Append("\x1B[1m\x1B[31m"); Console.Error.WriteLine(message);
outputBuilder.Append(message);
outputBuilder.Append("\x1B[39m\x1B[22m");
outputBuilder.AppendLine();
if (logToStdError)
{
Console.Error.Write(outputBuilder.ToString());
}
else
{
Console.Out.WriteLine(outputBuilder.ToString());
}
outputBuilder.Clear();
} }
else else
{ {

4
src/Squidex.Write/Assets/AssetCommandHandler.cs

@ -44,7 +44,7 @@ namespace Squidex.Write.Assets
c.Create(command); c.Create(command);
await assetStore.UploadAsync(c.Id, c.Version, null, command.File.OpenRead()); await assetStore.UploadAsync(c.Id, c.FileVersion, null, command.File.OpenRead());
context.Succeed(EntityCreatedResult.Create(c.Id, c.Version)); context.Succeed(EntityCreatedResult.Create(c.Id, c.Version));
}); });
@ -58,7 +58,7 @@ namespace Squidex.Write.Assets
c.Update(command); c.Update(command);
await assetStore.UploadAsync(c.Id, c.Version, null, command.File.OpenRead()); await assetStore.UploadAsync(c.Id, c.FileVersion, null, command.File.OpenRead());
}); });
} }

7
src/Squidex.Write/Assets/AssetDomainObject.cs

@ -22,7 +22,7 @@ namespace Squidex.Write.Assets
public class AssetDomainObject : DomainObjectBase public class AssetDomainObject : DomainObjectBase
{ {
private bool isDeleted; private bool isDeleted;
private long fileVersion; private long fileVersion = -1;
private string fileName; private string fileName;
public bool IsDeleted public bool IsDeleted
@ -35,6 +35,11 @@ namespace Squidex.Write.Assets
get { return fileName; } get { return fileName; }
} }
public long FileVersion
{
get { return fileVersion; }
}
public AssetDomainObject(Guid id, int version) public AssetDomainObject(Guid id, int version)
: base(id, version) : base(id, version)
{ {

4
tests/Squidex.Write.Tests/Assets/AssetDomainObjectTests.cs

@ -56,7 +56,7 @@ namespace Squidex.Write.Assets
IsImage = true, IsImage = true,
FileName = file.FileName, FileName = file.FileName,
FileSize = file.FileSize, FileSize = file.FileSize,
FileVersion = 1, FileVersion = 0,
MimeType = file.MimeType, MimeType = file.MimeType,
PixelWidth = image.PixelWidth, PixelWidth = image.PixelWidth,
PixelHeight = image.PixelHeight PixelHeight = image.PixelHeight
@ -98,7 +98,7 @@ namespace Squidex.Write.Assets
{ {
IsImage = true, IsImage = true,
FileSize = file.FileSize, FileSize = file.FileSize,
FileVersion = 2, FileVersion = 1,
MimeType = file.MimeType, MimeType = file.MimeType,
PixelWidth = image.PixelWidth, PixelWidth = image.PixelWidth,
PixelHeight = image.PixelHeight PixelHeight = image.PixelHeight

Loading…
Cancel
Save