sbrl-github/GalleryShare
1
0
Fork 0
mirror of https://gitlab.com/sbrl/GalleryShare.git synced 2018-06-12 22:45:16 +00:00
Code Activity

Finish writing & wire up new directory previewer

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-08-10 21:41:43 +01:00
parent 39d04706ed
commit baaca4ca60
2 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
GalleryShare/RequestRouter/RouteDirectoryListing.cs
View file

@ -4,6 +4,7 @@ using System.Xml;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Drawing;
namespace GalleryShare.RequestRouter namespace GalleryShare.RequestRouter
{ {
@ -14,6 +15,8 @@ namespace GalleryShare.RequestRouter
public int Priority { get; } = 5; public int Priority { get; } = 5;
public Size thumbnailSize { get; private set; } = new Size(300, 200);
public RouteDirectoryListing() public RouteDirectoryListing()
{ {
} }
@ -32,6 +35,12 @@ namespace GalleryShare.RequestRouter
public async Task HandleRequestAsync(HttpListenerContext cycle, string requestedPath) public async Task HandleRequestAsync(HttpListenerContext cycle, string requestedPath)
{ {
if (cycle.Request.QueryString["type"] == "thumbnail")
{
await ThumbnailGenerator.SendThumbnailPng(requestedPath, thumbnailSize, cycle);
return;
}
cycle.Response.ContentType = "application/xml"; cycle.Response.ContentType = "application/xml";
List<string> dirFiles = new List<string>(Directory.GetFiles(requestedPath)); List<string> dirFiles = new List<string>(Directory.GetFiles(requestedPath));

28
GalleryShare/ThumbnailGenerator.cs
View file

@ -14,7 +14,13 @@ namespace GalleryShare
{ {
public static async Task SendThumbnailPng(string imagePath, Size thumbnailBounds, HttpListenerContext cycle) public static async Task SendThumbnailPng(string imagePath, Size thumbnailBounds, HttpListenerContext cycle)
{ {
Image imageToSend = GenerateFileThumbnail(imagePath, thumbnailBounds); bool dummy;
Image imageToSend;
if (Directory.Exists(imagePath))
imageToSend = GenerateDirectoryThumbnail(imagePath, thumbnailBounds);
else
imageToSend = GenerateFileThumbnail(imagePath, thumbnailBounds, out dummy); // Has error image generation built in
byte[] imageData = GetImageBytesPng(imageToSend); byte[] imageData = GetImageBytesPng(imageToSend);
cycle.Response.ContentType = "image/png"; cycle.Response.ContentType = "image/png";
@ -33,14 +39,24 @@ namespace GalleryShare
Bitmap resultImage = new Bitmap(thumbnailSize.Width, thumbnailSize.Height); Bitmap resultImage = new Bitmap(thumbnailSize.Width, thumbnailSize.Height);
using(Graphics context = Graphics.FromImage(resultImage)) using(Graphics context = Graphics.FromImage(resultImage))
{ {
for(int i = 0; i < 4; i++) bool isErrorImage;
int filesSkipped = 0;
for(int i = 0; i < 4 + filesSkipped; i++)
{ {
using (Image fileThumbnail = GenerateFileThumbnail( using (Image fileThumbnail = GenerateFileThumbnail(
dirFiles[i], dirFiles[i],
new Size(thumbnailSize.Width, thumbnailSize.Height) new Size(thumbnailSize.Width / 2, thumbnailSize.Height / 2),
out isErrorImage
)) ))
{ {
PointF drawingPos = getDirectoryImageDrawPosition(i).Multiply(new PointF(resultImage.Width, resultImage.Height)); // If an error image has been generated, then we don't really want to
// include it in the preview
if(isErrorImage)
{
filesSkipped++;
continue;
}
PointF drawingPos = getDirectoryImageDrawPosition(i - filesSkipped).Multiply(new PointF(resultImage.Width, resultImage.Height));
context.DrawImage(fileThumbnail, drawingPos.ToIntPoint()); context.DrawImage(fileThumbnail, drawingPos.ToIntPoint());
} }
} }
@ -49,8 +65,9 @@ namespace GalleryShare
return resultImage; return resultImage;
} }
public static Image GenerateFileThumbnail(string imagePath, Size thumbnailBounds) public static Image GenerateFileThumbnail(string imagePath, Size thumbnailBounds, out bool errorImage)
{ {
errorImage = false;
try { try {
using (Bitmap rawImage = new Bitmap(imagePath)) { using (Bitmap rawImage = new Bitmap(imagePath)) {
float scaleFactor = Math.Min( float scaleFactor = Math.Min(
@ -78,6 +95,7 @@ namespace GalleryShare
} }
catch (Exception error) catch (Exception error)
{ {
errorImage = true;
Console.WriteLine("[{0}] Error generating thumbnail {1}: {2}", Console.WriteLine("[{0}] Error generating thumbnail {1}: {2}",
DateTime.Now.ToShortTimeString(), DateTime.Now.ToShortTimeString(),
imagePath, imagePath,