swcs/mixtape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

start moving media into separate table

Browse Source
This commit is contained in:
Tobias Klika
2020-05-14 15:40:41 +02:00
parent 0cc08e5779
commit 4fd2f2fc23
13 changed files with 79 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zero.Core/Api/BackofficeStore.cs
+18 -14
View File
@@ -91,24 +91,24 @@ namespace zero.Core.Api
}
// find all media items in model
List<ObjectTraverser.Result<Media>> media = ObjectTraverser.Find<Media>(model);
//List<ObjectTraverser.Result<Media>> media = ObjectTraverser.Find<Media>(model);
// upload media items
Dictionary<string, Media> mediaItems = new Dictionary<string, Media>();
//Dictionary<string, Media> mediaItems = new Dictionary<string, Media>();
foreach (ObjectTraverser.Result<Media> item in media)
{
string id = item.Item?.Id;
//foreach (ObjectTraverser.Result<Media> item in media)
//{
// string id = item.Item?.Id;
if (!Media.Upload(item.Item, out bool uploaded, out string uploadError))
{
return EntityResult<T>.Fail(item.Path, uploadError);
}
else
{
mediaItems.Add(id, item.Item);
}
}
// if (!Media.Upload(item.Item, out bool uploaded, out string uploadError))
// {
// return EntityResult<T>.Fail(item.Path, uploadError);
// }
// else
// {
// mediaItems.Add(id, item.Item);
// }
//}
//if (operation.Media != null)
//{
@@ -155,7 +155,11 @@ namespace zero.Core.Api
using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
{
// store entity
await session.StoreAsync(model);
// store media
await session.SaveChangesAsync();
}
zero.Core/Api/MediaUpload.cs
+13 -6
View File
@@ -44,15 +44,18 @@ namespace zero.Core.Api
return true;
}
// generate new id
media.Id = IdGenerator.Create();
// set id to null in case it was prefixed to signal an upload
media.Id = null;
// generate file id which is used as the folder name on disk
media.FileId = IdGenerator.Create();
// get bytes for media content
string byteString = media.Source.Split(SEP)[1];
byte[] bytes = Convert.FromBase64String(byteString);
// build folder and full file path
string folderPath = Path.Combine(Paths.Media, media.Id);
string folderPath = Path.Combine(Paths.Media, media.FileId);
string filePath = Path.Combine(folderPath, media.Name);
Paths.Create(folderPath);
@@ -81,15 +84,19 @@ namespace zero.Core.Api
Size = new Size(100, 100),
Mode = ResizeMode.Max
}));
image.Save(filePath.Replace(extension, THUMB_EXTENSION + extension));
media.HasThumbnail = true;
string thumbFileName = media.Name.Replace(extension, THUMB_EXTENSION + extension);
string thumbSourcePath = Path.Combine(Paths.Media, media.FileId, thumbFileName);
image.Save(thumbSourcePath);
media.ThumbnailSource = Path.Combine(PATH_PREFIX, media.FileId, thumbFileName).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
}
}
// set new properties
media.LastModifiedDate = DateTimeOffset.Now;
media.Source = Path.Combine(PATH_PREFIX, media.Id, media.Name).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
media.Source = Path.Combine(PATH_PREFIX, media.FileId, media.Name).Replace(Path.DirectorySeparatorChar, PATH_SEPARATOR);
media.Size = bytes.Length;
uploaded = true;
zero.Core/Entities/Media/Media.cs
+16 -19
View File
@@ -5,16 +5,16 @@ namespace zero.Core.Entities
/// <summary>
/// A media file (can contain an image or other media like videos and documents)
/// </summary>
public class Media : IMedia, IZeroDbConventions
public class Media : ZeroEntity, IMedia
{
/// <inheritdoc />
public string Id { get; set; }
/// <inheritdoc />
public string AppId { get; set; }
/// <inheritdoc />
public string Name { get; set; }
public string FileId { get; set; }
/// <inheritdoc />
public string FolderId { get; set; }
/// <inheritdoc />
public string AlternativeText { get; set; }
@@ -26,7 +26,7 @@ namespace zero.Core.Entities
public string Source { get; set; }
/// <inheritdoc />
public bool HasThumbnail { get; set; }
public string ThumbnailSource { get; set; }
/// <inheritdoc />
public int Size { get; set; }
@@ -39,18 +39,20 @@ namespace zero.Core.Entities
/// <inheritdoc />
public MediaFocalPoint FocalPoint { get; set; }
/// <inheritdoc />
public string FolderId { get; set; }
}
public interface IMedia : IZeroIdEntity, IAppAwareEntity
public interface IMedia : IZeroEntity, IAppAwareEntity, IZeroDbConventions
{
/// <summary>
/// File name
/// Id/name of the folder which is stored on disk/cloud
/// </summary>
public string Name { get; set; }
public string FileId { get; set; }
/// <summary>
/// Id of the media folder
/// </summary>
public string FolderId { get; set; }
/// <summary>
/// Alternative text which is used when the image can't be loaded
@@ -68,9 +70,9 @@ namespace zero.Core.Entities
string Source { get; set; }
/// <summary>
/// Whether this file has a thumbnail
/// For images this is the source for a 100x100px thumbnail
/// </summary>
bool HasThumbnail { get; set; }
string ThumbnailSource { get; set; }
/// <summary>
/// Filesize in bytes
@@ -91,10 +93,5 @@ namespace zero.Core.Entities
/// Optional focal point for an image
/// </summary>
MediaFocalPoint FocalPoint { get; set; }
/// <summary>
/// Id of the folder
/// </summary>
public string FolderId { get; set; }
}
}
zero.Core/Entities/Media/MediaFolder.cs
+4 -1
View File
@@ -3,8 +3,11 @@
/// <summary>
/// A media folder contains media and other folders
/// </summary>
public class MediaFolder : ZeroEntity
public class MediaFolder : ZeroEntity, IAppAwareEntity, IZeroDbConventions
{
/// <inheritdoc />
public string AppId { get; set; }
/// <summary>
/// Parent folder id
/// </summary>
zero.Core/Entities/User/User.cs
+2 -2
View File
@@ -24,7 +24,7 @@ namespace zero.Core.Entities
public string SecurityStamp { get; set; }
/// <inheritdoc/>
public Media Avatar { get; set; }
public string AvatarId { get; set; }
/// <inheritdoc/>
public string LanguageId { get; set; }
@@ -101,7 +101,7 @@ namespace zero.Core.Entities
/// <summary>
/// Avatar image
/// </summary>
Media Avatar { get; set; }
string AvatarId { get; set; }
/// <summary>
/// Backoffice display language