Merge pull request #24 from David032/22-fix-file-pathingautorun-issues

22 Fix file pathing/autorun issues
David032 · Jan 15, 2024 · 81558b6 · 81558b6
2 parents 8a7fe25 + 4e180be
commit 81558b6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/skullOS.Core/FileManager.cs b/skullOS.Core/FileManager.cs
@@ -6,16 +6,24 @@ public static class FileManager
     {
         private static string rootDirectoryPath = string.Empty;
 
-        public static void CreateSkullDirectory()
+        public static void CreateSkullDirectory(bool usePersonalDir = true)
         {
             DirectoryInfo rootDirectory = null;
-            string pathToPersonalDir = @Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+            string pathToDir;
+            if (usePersonalDir)
+            {
+                pathToDir = @Environment.GetFolderPath(Environment.SpecialFolder.Personal);
+            }
+            else
+            {
+                pathToDir = "/media";
+            }
             try
             {
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
                 {
-                    rootDirectory = Directory.CreateDirectory(@pathToPersonalDir + @"/skullOS",
-                        unixCreateMode: UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
+                    rootDirectory = Directory.CreateDirectory(pathToDir + @"/skullOS",
+                        unixCreateMode: UnixFileMode.OtherRead | UnixFileMode.OtherWrite | UnixFileMode.OtherExecute);
                 }
             }
             catch (Exception e)

diff --git a/skullOS.HardwareServices/CameraService.cs b/skullOS.HardwareServices/CameraService.cs
@@ -31,6 +31,7 @@ public async Task<string> TakePictureAsync(string fileLocation)
                 .WithTimeout(1)
                 .WithVflip()
                 .WithHflip()
+                .WithPictureOptions(quality: 100)
                 .WithResolution(2592, 1944);
             var args = builder.GetArguments();
 
@@ -39,8 +40,9 @@ public async Task<string> TakePictureAsync(string fileLocation)
             Console.WriteLine(proc.GetFullCommandLine(args));
             Console.WriteLine();
 
-            //string? filename = $"{fileLocation} {DateTime.Now:yyyyMMddHHmmss}.jpg";
-            string? filename = $"{DateTime.Now:yyyyMMddHHmmss}.jpg"; //Fakename
+            var timestamp = DateTime.Now.ToString("yyyyMMddHHmmss");
+            string? filename = fileLocation + timestamp + ".jpg";
+            //string? filename = $"{DateTime.Now:yyyyMMddHHmmss}.jpg"; //Fakename
             try
             {
                 using var file = File.OpenWrite(filename);

diff --git a/skullOS/Program.cs b/skullOS/Program.cs
@@ -42,7 +42,7 @@ static void Run(bool shouldCreateDirectory = true)
         {
             if (shouldCreateDirectory)
             {
-                FileManager.CreateSkullDirectory();
+                FileManager.CreateSkullDirectory(false);
             }
 
             SkullLogger logger = new();