added action for raw files; added test app config dbo; removed use static files

Luticate2.Utils/Controllers/LuFsFilesCrudController.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using System.IO;
 using Luticate2.Utils.Dbo.Basic;
 using Luticate2.Utils.Dbo.FsFiles;
 using Luticate2.Utils.Dbo.PaginatedRequest;
@@ -6,20 +7,47 @@ using Luticate2.Utils.Interfaces;
 using Luticate2.Utils.Utils;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Options;
 
 namespace Luticate2.Utils.Controllers
 {
-    public class LuFsFilesCrudController<TBusiness> : LuController
+    public abstract class LuFsFilesCrudController<TBusiness> : LuController
         where TBusiness : ILuCrudInterface<LuFsFilesAddDbo, LuFsFilesDbo, LuFsFilesAddDbo, string>
     {
         protected readonly TBusiness Business;
 
-        public LuFsFilesCrudController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo, TBusiness business) : base(luUtilsOptionsDbo)
+        protected LuFsFilesCrudController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo, TBusiness business) : base(luUtilsOptionsDbo)
         {
             Business = business;
         }
 
+        protected abstract string GetBasePath();
+
+        [HttpGet]
+        [Route("[controller]/{id}/raw")]
+        public virtual IActionResult GetSingleByIdRaw([Required]string id, bool forceDownload = false)
+        {
+            var get = Business.GetSingleById(id);
+            if (!get)
+            {
+                throw new LuResultException(get.To<object>());
+            }
+            string type;
+            var contentTypeProvider = new FileExtensionContentTypeProvider();
+            if (!contentTypeProvider.TryGetContentType(id, out type))
+            {
+                type = "application/octet-stream";
+            }
+            var fullPath = Path.Combine(new FileInfo(GetBasePath()).FullName, get.Data.Path);
+            var stream = new FileStream(fullPath, FileMode.Open, FileAccess.Read);
+            if (forceDownload)
+            {
+                return File(stream, type, get.Data.Path);
+            }
+            return new FileStreamResult(stream, type);
+        }
+
         [HttpGet]
         [Route("[controller]/{id}")]
         public virtual LuApiWrapperDbo<LuFsFilesDbo> GetSingleById([Required]string id)

Luticate2.Utils/project.json

@@ -13,7 +13,8 @@
     "Microsoft.AspNetCore.WebSockets": "1.0.0",
     "Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final",
     "NETStandard.Library": "1.6.1",
-    "Npgsql.EntityFrameworkCore.PostgreSQL": "1.1.0"
+    "Npgsql.EntityFrameworkCore.PostgreSQL": "1.1.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.1.0"
   },
   "frameworks": {
     "netstandard1.6": {

WebApiUtils/Controllers/UploadController.cs

@@ -2,13 +2,23 @@
 using Luticate2.Utils.Dbo.Basic;
 using Microsoft.Extensions.Options;
 using WebApiUtils.Business;
+using WebApiUtils.Dbo;
 
 namespace WebApiUtils.Controllers
 {
     public class UploadController : LuFsFilesCrudController<UploadBusiness>
     {
-        public UploadController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo, UploadBusiness business) : base(luUtilsOptionsDbo, business)
+        private readonly AppConfigDbo _options;
+
+        public UploadController(IOptions<LuUtilsOptionsDbo> luUtilsOptionsDbo, IOptions<AppConfigDbo> options,
+            UploadBusiness business) : base(luUtilsOptionsDbo, business)
+        {
+            _options = options.Value;
+        }
+
+        protected override string GetBasePath()
         {
+            return _options.UploadDir;
         }
     }
 }

WebApiUtils/DataAccess/UploadDataAccess.cs

@@ -1,12 +1,21 @@
 using Luticate2.Utils.DataAccess;
+using Microsoft.Extensions.Options;
+using WebApiUtils.Dbo;
 
 namespace WebApiUtils.DataAccess
 {
     public class UploadDataAccess : LuFsFilesCrudDataAccess
     {
+        private readonly AppConfigDbo _options;
+
+        public UploadDataAccess(IOptions<AppConfigDbo> options)
+        {
+            _options = options.Value;
+        }
+
         public override string GetBasePath()
         {
-            return "/tmp/luticate2/";
+            return _options.UploadDir;
         }
     }
 }

WebApiUtils/Dbo/AppConfigDbo.cs

@@ -0,0 +1,7 @@
+namespace WebApiUtils.Dbo
+{
+    public class AppConfigDbo
+    {
+        public string UploadDir { get; set; }
+    }
+}

WebApiUtils/Startup.cs

@@ -11,6 +11,7 @@ using Microsoft.Extensions.Logging;
 using TestUtils.DataAccess;
 using WebApiUtils.Business;
 using WebApiUtils.DataAccess;
+using WebApiUtils.Dbo;
 
 namespace WebApiUtils
 {
@@ -47,7 +48,14 @@ namespace WebApiUtils
             services.AddScoped<LuUtilsPkGuidDataAccess>();
             services.AddScoped<UploadBusiness>();
             services.AddScoped<UploadDataAccess>();
-            services.AddDbContext<LuUtilsDbContext>(options =>
+
+            services.Configure<AppConfigDbo>(dbo =>
+            {
+                dbo.UploadDir = "/tmp/luticate2";
+                Directory.CreateDirectory(dbo.UploadDir);
+            });
+
+                services.AddDbContext<LuUtilsDbContext>(options =>
             {
                 options.UseNpgsql(Configuration.GetConnectionString("default"));
                 options.UseInternalServiceProvider(new ServiceCollection()
@@ -69,12 +77,12 @@ namespace WebApiUtils
 //            app.UseApplicationInsightsRequestTelemetry();
 //
 //            app.UseApplicationInsightsExceptionTelemetry();
-            app.UseStaticFiles(new StaticFileOptions
-            {
-                ServeUnknownFileTypes = true,
-                FileProvider = new PhysicalFileProvider("/tmp/luticate2"),
-                RequestPath = new PathString("/uploadraw")
-            });
+//            app.UseStaticFiles(new StaticFileOptions
+//            {
+//                ServeUnknownFileTypes = true,
+//                FileProvider = new PhysicalFileProvider("/tmp/luticate2"),
+//                RequestPath = new PathString("/uploadraw")
+//            });
 
             app.UseLuticateUtils();
 

WebApiUtils/project.json

@@ -13,7 +13,6 @@
         "Microsoft.Extensions.Logging.Console": "1.1.0",
         "Microsoft.Extensions.Logging.Debug": "1.1.0",
         "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
-        "Microsoft.AspNetCore.StaticFiles": "1.1.0",
         "Microsoft.NETCore.App": {
             "version": "1.0.1",
             "type": "platform"