@@ -22,13 +22,26 @@ class Program
2222 public static extern Int32 SystemParametersInfo ( UInt32 uiAction , UInt32 uiParam , String pvParam , UInt32 fWinIni ) ;
2323 public static UInt32 SPI_SETDESKWALLPAPER = 20 ;
2424 public static UInt32 SPIF_UPDATEINIFILE = 0x1 ;
25+ /// <summary>
26+ /// portable lively build, no installer.
27+ /// </summary>
28+ public static readonly bool isPortableBuild = false ;
29+ public static string PathData { get ; private set ; }
2530
2631 static void Main ( string [ ] args )
2732 {
2833
34+ if ( isPortableBuild )
35+ {
36+ PathData = AppDomain . CurrentDomain . BaseDirectory ;
37+ }
38+ else
39+ {
40+ PathData = Path . Combine ( System . Environment . GetFolderPath ( Environment . SpecialFolder . MyDocuments ) , "Lively Wallpaper" ) ;
41+ }
42+
2943 int livelyId ;
3044 Process lively ;
31-
3245 if ( args . Length == 0 )
3346 {
3447 Console . WriteLine ( "NO arguments sent." ) ;
@@ -76,7 +89,7 @@ static void Main(string[] args)
7689
7790 lively . WaitForExit ( ) ;
7891
79- Console . WriteLine ( "done waiting, ready to kill *_* " ) ;
92+ Console . WriteLine ( "done waiting, ready to kill.. " ) ;
8093 //Console.Read();
8194
8295 FileHandle . LoadRunningPrograms ( ) ;
@@ -86,8 +99,9 @@ static void Main(string[] args)
8699 Console . WriteLine ( "pgm list:- " + proc . ProcessName + " " + proc . MainWindowHandle ) ;
87100 foreach ( var wproc in FileHandle . runningPrograms )
88101 {
102+ //Pid + Process-name is unique enough to make sure its the correct pgm.
89103 if ( proc . ProcessName . Equals ( wproc . ProcessName , StringComparison . OrdinalIgnoreCase ) && proc . Id == wproc . Pid ) //&& IntPtr.Equals(proc.MainWindowHandle,wproc.handle))//proc.Handle == wproc.handle)
90- {
104+ {
91105 Console . WriteLine ( "Unclosed pgm, kill:- " + proc . ProcessName ) ;
92106 try
93107 {
@@ -122,7 +136,7 @@ public RunningProgram()
122136 }
123137
124138 public static List < RunningProgram > runningPrograms = new List < RunningProgram > ( ) ;
125- private static string pathData = Path . Combine ( System . Environment . GetFolderPath ( Environment . SpecialFolder . MyDocuments ) , "LivelyWallpaper " ) ;
139+ // private static string pathData = Path.Combine(System.Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments), "Lively Wallpaper ");
126140
127141 public class RunningProgramsList
128142 {
@@ -131,26 +145,19 @@ public class RunningProgramsList
131145
132146 public static void LoadRunningPrograms ( )
133147 {
134- if ( ! File . Exists ( Path . Combine ( pathData , "lively_running_pgms.json" ) ) )
135- {
136- return ;
137- }
138-
139148 try
140149 {
141-
142150 // deserialize JSON directly from a file
143- using ( StreamReader file = File . OpenText ( Path . Combine ( pathData , "lively_running_pgms.json" ) ) )
151+ using ( StreamReader file = File . OpenText ( Path . Combine ( Program . PathData , "lively_running_pgms.json" ) ) )
144152 {
145153 JsonSerializer serializer = new JsonSerializer ( ) ;
146154 RunningProgramsList tmp = ( RunningProgramsList ) serializer . Deserialize ( file , typeof ( RunningProgramsList ) ) ;
147155 runningPrograms = tmp . Item ;
148156 }
149-
150157 }
151- catch ( Exception e )
158+ catch
152159 {
153- System . Diagnostics . Debug . WriteLine ( e . Message + " " + e . StackTrace ) ;
160+ Debug . WriteLine ( "failed to read json" ) ;
154161 }
155162 }
156163
@@ -170,10 +177,17 @@ public static void SaveRunningPrograms()
170177 NullValueHandling = NullValueHandling . Include
171178 } ;
172179
173- using ( StreamWriter sw = new StreamWriter ( Path . Combine ( pathData , "\\ lively_running_pgms.json" ) ) )
174- using ( JsonWriter writer = new JsonTextWriter ( sw ) )
180+ try
181+ {
182+ using ( StreamWriter sw = new StreamWriter ( Path . Combine ( Program . PathData , "lively_running_pgms.json" ) ) )
183+ using ( JsonWriter writer = new JsonTextWriter ( sw ) )
184+ {
185+ serializer . Serialize ( writer , tmp ) ;
186+ }
187+ }
188+ catch
175189 {
176- serializer . Serialize ( writer , tmp ) ;
190+ Debug . WriteLine ( "failed to write json" ) ;
177191 }
178192 }
179193
0 commit comments