diff --git a/Timelapse.Pack/Program.cs b/Timelapse.Pack/Program.cs index 81756d8..deb907a 100644 --- a/Timelapse.Pack/Program.cs +++ b/Timelapse.Pack/Program.cs @@ -100,7 +100,7 @@ public class TimelapsePack } return null; } - public static void DirCopy(string src,string dest,Func copyItem) + public static void DirCopy(string src,string dest,Func? copyItem) { foreach(var f in Directory.GetDirectories(src)) { @@ -109,6 +109,7 @@ public class TimelapsePack continue; } string fname =Path.GetFileName(f); + DirCopy(f,fname,copyItem); } @@ -141,8 +142,10 @@ public class TimelapsePack { Directory.CreateDirectory("_build/extension"); File.Copy("extension_info.json","_build/extension_info.json"); + string? dirname=Path.GetDirectoryName(outPut); - DirCopy(Path.GetDirectoryName(outPut),"_build/extension",(e)=>{ + if(!string.IsNullOrWhiteSpace(dirname)){ + DirCopy(dirname,"_build/extension",(e)=>{ if(e==outPut) { return false; @@ -165,6 +168,7 @@ public class TimelapsePack ZipFile.CreateFromDirectory ("_build",fname,CompressionLevel.SmallestSize, false); Directory.Delete("_build"); return fname; + } } return null; } @@ -176,7 +180,9 @@ public class TimelapsePack Console.Write($"Are you sure you want to delete {name} (Yes/No): "); j: - var read=Console.ReadLine().ToLower(); + var read=Console.ReadLine(); + if(string.IsNullOrWhiteSpace(read)) read=""; + read=read.ToLower(); if(read == "yes") { Console.WriteLine("I asked ya, you said yes so deleting"); diff --git a/Timelapse.Pack/Timelapse.Pack.csproj b/Timelapse.Pack/Timelapse.Pack.csproj index 0721b25..50b6861 100644 --- a/Timelapse.Pack/Timelapse.Pack.csproj +++ b/Timelapse.Pack/Timelapse.Pack.csproj @@ -1,11 +1,10 @@ + - - - - - + + + Exe diff --git a/TimelapseApi/TimelapseApi.csproj b/TimelapseApi/TimelapseApi.csproj index d772725..750ce34 100644 --- a/TimelapseApi/TimelapseApi.csproj +++ b/TimelapseApi/TimelapseApi.csproj @@ -9,9 +9,9 @@ Tesses.TimelapseApi Mike Nolan Tesses - 1.0.0 - 1.0.0 - 1.0.0 + 1.0.1 + 1.0.1 + 1.0.1 The api for TimelapseNow GPL-3.0-only true diff --git a/TimelapseApi/TimelapseSettings.cs b/TimelapseApi/TimelapseSettings.cs index 83d4408..7eb367c 100644 --- a/TimelapseApi/TimelapseSettings.cs +++ b/TimelapseApi/TimelapseSettings.cs @@ -24,9 +24,7 @@ internal class FrameHandlerSettingsForm : Dialog internal class FrameHandlerSettings { public Guid Guid; - CheckBox? cb; - private bool? _chk; - + public FrameHandlerSettings(TimelapseExtension ext,string handlerName,bool overlay,bool block) { ExtensionName=ext.Name;