Only in .: .diff.store Only in .: bin diff --ignore-all-space -r .diff.store/ConfigDialog.cs ./ConfigDialog.cs 116c116 < if (tbFStruct.Text == "\\") { --- > if (tbFStruct.Text == System.IO.Path.DirectorySeparatorChar.ToString()) { 164,165c164,165 < if (!tbFStruct.Text.EndsWith("\\")) < tbFStruct.Text += "\\"; --- > if (!tbFStruct.Text.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) > tbFStruct.Text += System.IO.Path.DirectorySeparatorChar.ToString(); 168c168 < if (ch != '\\') --- > if (ch != System.IO.Path.DirectorySeparatorChar) 324,325c324,325 < if (!tbFStruct.Text.EndsWith("\\")) < tbFStruct.Text += "\\"; --- > if (!tbFStruct.Text.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) > tbFStruct.Text += System.IO.Path.DirectorySeparatorChar; 385c385 < tbFStruct.Text = "\\"; --- > tbFStruct.Text = System.IO.Path.DirectorySeparatorChar.ToString(); diff --ignore-all-space -r .diff.store/Funcs.cs ./Funcs.cs 180,181c180,181 < if (!dir.EndsWith(@"\")) < dir += @"\"; --- > if (!dir.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) > dir += System.IO.Path.DirectorySeparatorChar; 215,216c215,216 < if (!path.EndsWith("\\")) < path += "\\"; --- > if (!path.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) > path += System.IO.Path.DirectorySeparatorChar; 306c306 < if (ch != '\\') // convert invalid chars except for backslashes into spaces --- > if (ch != System.IO.Path.DirectorySeparatorChar) // convert invalid chars except for backslashes into spaces 317,318c317,318 < path = path.Replace(@"\ ", @"\"); // shouldn't create paths with a starting space. valid, but best not to. < path = path.Replace(@" \", @"\"); // can't create paths with a trailing space - will cause the playlist to be inaccurate --- > path = path.Replace(System.IO.Path.DirectorySeparatorChar+" ", System.IO.Path.DirectorySeparatorChar.ToString()); // shouldn't create paths with a starting space. valid, but best not to. > path = path.Replace(" "+System.IO.Path.DirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar.ToString()); // can't create paths with a trailing space - will cause the playlist to be inaccurate Only in .: obj Only in .: Properties diff --ignore-all-space -r .diff.store/Saver.cs ./Saver.cs 34c34 < string tp = Path.GetTempPath() + "\\Saver2\\"; --- > string tp = Path.GetTempPath() + System.IO.Path.DirectorySeparatorChar + "Saver2" + System.IO.Path.DirectorySeparatorChar; 45c45 < if (!s.EndsWith("\\")) s += "\\"; --- > if (!s.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) s += System.IO.Path.DirectorySeparatorChar; 89c89 < Settings.Default("SaveDir", Environment.GetFolderPath(Environment.SpecialFolder.Personal) + "\\Saved Music\\"); --- > Settings.Default("SaveDir", Environment.GetFolderPath(Environment.SpecialFolder.Personal) + System.IO.Path.DirectorySeparatorChar + "Saved Music" + System.IO.Path.DirectorySeparatorChar); 100c100 < Settings.Default("FolderStructure", "%artist%\\%album%\\"); --- > Settings.Default("FolderStructure", "%artist%" + System.IO.Path.DirectorySeparatorChar + "%album%" + System.IO.Path.DirectorySeparatorChar); 492c492 < Funcs.Log("Failed to delete temp file " + file.Substring(file.LastIndexOf("\\"))); --- > Funcs.Log("Failed to delete temp file " + file.Substring(file.LastIndexOf(System.IO.Path.DirectorySeparatorChar.ToString()))); 701c701 < if (path.EndsWith("\\")) --- > if (path.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString())) 725c725 < RecursiveDeleteEmptyFolders(path.Substring(0, path.LastIndexOf("\\")), farthest); --- > RecursiveDeleteEmptyFolders(path.Substring(0, path.LastIndexOf(System.IO.Path.DirectorySeparatorChar.ToString())), farthest); diff --ignore-all-space -r .diff.store/Saver.Processing.cs ./Saver.Processing.cs 260c260 < string AARTname = Song.FileName.Substring(0, Song.FileName.LastIndexOf("\\") + 1) + Funcs.SanatizePath(Song.Album) + ".png"; --- > string AARTname = Path.GetDirectoryName(Song.FileName) + Funcs.SanatizePath(Song.Album) + ".png"; 660c660 < Funcs.Log("Removing " + Name.Substring(Name.LastIndexOf("\\") + 1) + " from " + playlist.Substring(playlist.LastIndexOf("\\") + 1)); --- > Funcs.Log("Removing " + Path.GetFileName(Name) + " from " + Path.GetFileName(playlist)); 701c701 < Funcs.Log("Failed to rewrite " + playlist.Substring(playlist.LastIndexOf("\\") + 1) + "! " + e.Message); --- > Funcs.Log("Failed to rewrite " + Path.GetFileName(playlist) + "! " + e.Message); 726c726 < Funcs.Log("Adding " + Name.Substring(Name.LastIndexOf("\\") + 1) + " to " + playlist); --- > Funcs.Log("Adding " + Path.GetFileName(Name) + " to " + playlist); diff --ignore-all-space -r .diff.store/SongInfo.cs ./SongInfo.cs 188c188 < public string PathFormat = "%artist%\\%album%\\"; --- > public string PathFormat = "%artist%" + System.IO.Path.DirectorySeparatorChar + "%album%" + System.IO.Path.DirectorySeparatorChar; 317c317 < AbsPath = (Saver.SaveDir + RelPath).Replace("\\\\","\\"); --- > AbsPath = (Saver.SaveDir + RelPath).Replace(System.IO.Path.DirectorySeparatorChar.ToString() + System.IO.Path.DirectorySeparatorChar, System.IO.Path.DirectorySeparatorChar.ToString()); 330,331c330 < string shortName = s.Substring(s.LastIndexOf("\\") + 1); < shortName = shortName.Substring(0, shortName.LastIndexOf(".")); --- > string shortName = Path.GetFileNameWithoutExtension(s); 399c398 < PathFormat = Settings.GetValue("FolderStructure", "%artist%\\"); --- > PathFormat = Settings.GetValue("FolderStructure", "%artist%" + System.IO.Path.DirectorySeparatorChar); Only in .: Thumbs.db