diff --git a/.vscode/launch.json b/.vscode/launch.json index 961599e..069b995 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/src/PicSort.CLI/bin/Debug/netcoreapp2.1/PicSort.CLI.dll", + "program": "${workspaceFolder}/src/FileSort.CLI/bin/Debug/netcoreapp2.1/FileSort.CLI.dll", "args": [], - "cwd": "${workspaceFolder}/src/PicSort.CLI", + "cwd": "${workspaceFolder}/src/FileSort.CLI", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window "console": "internalConsole", "stopAtEntry": false, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 67e82f8..1b70613 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/src/PicSort.CLI/PicSort.CLI.csproj" + "${workspaceFolder}/src/FileSort.CLI/FileSort.CLI.csproj" ], "problemMatcher": "$msCompile" } diff --git a/PicSort.sln b/FileSort.sln similarity index 92% rename from PicSort.sln rename to FileSort.sln index f29aae4..ff5a1ef 100644 --- a/PicSort.sln +++ b/FileSort.sln @@ -7,11 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93E24B7F-DE3 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E0315440-BA84-40AE-8803-92812177EE73}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicSort.Core", "src\PicSort.Core\PicSort.Core.csproj", "{B373C891-F46A-41A5-B00B-C8A82CBA22C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSort.Core", "src\FileSort.Core\FileSort.Core.csproj", "{B373C891-F46A-41A5-B00B-C8A82CBA22C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicSort.Core.UnitTests", "tests\PicSort.Core.UnitTests\PicSort.Core.UnitTests.csproj", "{0BD4DBEE-41B8-4E97-A014-60B801840EEC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSort.Core.UnitTests", "tests\FileSort.Core.UnitTests\FileSort.Core.UnitTests.csproj", "{0BD4DBEE-41B8-4E97-A014-60B801840EEC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PicSort.CLI", "src\PicSort.CLI\PicSort.CLI.csproj", "{2C7365DC-349E-4B52-A70E-7CF7957B06E2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSort.CLI", "src\FileSort.CLI\FileSort.CLI.csproj", "{2C7365DC-349E-4B52-A70E-7CF7957B06E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/PicSort.sln.DotSettings b/FileSort.sln.DotSettings similarity index 100% rename from PicSort.sln.DotSettings rename to FileSort.sln.DotSettings diff --git a/README.md b/README.md index f963a5b..db7c6f7 100644 --- a/README.md +++ b/README.md @@ -52,4 +52,4 @@ Here's how my Dropbox looks: `sort-files -m` -[![Build Status](https://dev.azure.com/bogdan-tfs/PicSort/_apis/build/status/thewindev.PicSort?branchName=master)](https://dev.azure.com/bogdan-tfs/PicSort/_build/latest?definitionId=11&branchName=master) +[![Build Status](https://dev.azure.com/bogdan-tfs/FileSort/_apis/build/status/thewindev.FileSort?branchName=master)](https://dev.azure.com/bogdan-tfs/FileSort/_build/latest?definitionId=11&branchName=master) diff --git a/src/PicSort.CLI/.vscode/launch.json b/src/FileSort.CLI/.vscode/launch.json similarity index 98% rename from src/PicSort.CLI/.vscode/launch.json rename to src/FileSort.CLI/.vscode/launch.json index f74f407..18203eb 100644 --- a/src/PicSort.CLI/.vscode/launch.json +++ b/src/FileSort.CLI/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/bin/Debug/netcoreapp2.1/PicSort.CLI.dll", + "program": "${workspaceFolder}/bin/Debug/netcoreapp2.1/FileSort.CLI.dll", "args": [], "cwd": "${workspaceFolder}", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window diff --git a/src/PicSort.CLI/.vscode/tasks.json b/src/FileSort.CLI/.vscode/tasks.json similarity index 82% rename from src/PicSort.CLI/.vscode/tasks.json rename to src/FileSort.CLI/.vscode/tasks.json index 5e4515a..da734d1 100644 --- a/src/PicSort.CLI/.vscode/tasks.json +++ b/src/FileSort.CLI/.vscode/tasks.json @@ -7,7 +7,7 @@ "type": "process", "args": [ "build", - "${workspaceFolder}/PicSort.CLI.csproj" + "${workspaceFolder}/FileSort.CLI.csproj" ], "problemMatcher": "$msCompile" } diff --git a/src/PicSort.CLI/PicSort.CLI.csproj b/src/FileSort.CLI/FileSort.CLI.csproj similarity index 89% rename from src/PicSort.CLI/PicSort.CLI.csproj rename to src/FileSort.CLI/FileSort.CLI.csproj index 02dc912..42281d6 100644 --- a/src/PicSort.CLI/PicSort.CLI.csproj +++ b/src/FileSort.CLI/FileSort.CLI.csproj @@ -11,7 +11,7 @@ 2.1.0 FileSort icon.ico - https://raw.githubusercontent.com/thewindev/FileSort/master/src/PicSort.CLI/icon.ico + https://raw.githubusercontent.com/thewindev/FileSort/master/src/FileSort.CLI/icon.ico https://github.com/thewindev/FileSort dotnet tool, file sort true @@ -23,7 +23,7 @@ 1.0.1.0 - + diff --git a/src/PicSort.CLI/Program.cs b/src/FileSort.CLI/Program.cs similarity index 95% rename from src/PicSort.CLI/Program.cs rename to src/FileSort.CLI/Program.cs index b5d927b..e67ae4c 100644 --- a/src/PicSort.CLI/Program.cs +++ b/src/FileSort.CLI/Program.cs @@ -1,13 +1,13 @@ using McMaster.Extensions.CommandLineUtils; -using PicSort.Core.Storage; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Storage; +using FileSort.Core.Classifiers.Date; using System; using System.IO; -namespace PicSort.CLI +namespace FileSort.CLI { class Program { diff --git a/src/PicSort.CLI/icon.ico b/src/FileSort.CLI/icon.ico similarity index 100% rename from src/PicSort.CLI/icon.ico rename to src/FileSort.CLI/icon.ico diff --git a/src/FileSort.CLI/reinstall.bat b/src/FileSort.CLI/reinstall.bat new file mode 100644 index 0000000..da102ee --- /dev/null +++ b/src/FileSort.CLI/reinstall.bat @@ -0,0 +1,5 @@ +dotnet tool uninstall -g FileSort.cli +dotnet build +dotnet pack +dotnet tool install --global --add-source ./nupkg FileSort.cli +pause \ No newline at end of file diff --git a/src/PicSort.Core/Classifiers/Classifier.cs b/src/FileSort.Core/Classifiers/Classifier.cs similarity index 71% rename from src/PicSort.Core/Classifiers/Classifier.cs rename to src/FileSort.Core/Classifiers/Classifier.cs index 51a3320..4446479 100644 --- a/src/PicSort.Core/Classifiers/Classifier.cs +++ b/src/FileSort.Core/Classifiers/Classifier.cs @@ -1,8 +1,8 @@ -using PicSort.Core.Storage; +using FileSort.Core.Storage; using System.Collections.Generic; -namespace PicSort.Core.Classifiers +namespace FileSort.Core.Classifiers { public interface IClassifier where T: ClassifierArgs { diff --git a/src/PicSort.Core/Classifiers/Date/DateClassifier.cs b/src/FileSort.Core/Classifiers/Date/DateClassifier.cs similarity index 92% rename from src/PicSort.Core/Classifiers/Date/DateClassifier.cs rename to src/FileSort.Core/Classifiers/Date/DateClassifier.cs index 1245989..0f2748f 100644 --- a/src/PicSort.Core/Classifiers/Date/DateClassifier.cs +++ b/src/FileSort.Core/Classifiers/Date/DateClassifier.cs @@ -1,10 +1,10 @@ -using PicSort.Core.Storage; -using PicSort.Core.DirectoryTools; +using FileSort.Core.Storage; +using FileSort.Core.DirectoryTools; using System; using System.Collections.Generic; -namespace PicSort.Core.Classifiers.Date +namespace FileSort.Core.Classifiers.Date { public class DateClassifier: IClassifier { diff --git a/src/PicSort.Core/Classifiers/Date/DateClassifierArgs.cs b/src/FileSort.Core/Classifiers/Date/DateClassifierArgs.cs similarity index 86% rename from src/PicSort.Core/Classifiers/Date/DateClassifierArgs.cs rename to src/FileSort.Core/Classifiers/Date/DateClassifierArgs.cs index c33abfe..7857021 100644 --- a/src/PicSort.Core/Classifiers/Date/DateClassifierArgs.cs +++ b/src/FileSort.Core/Classifiers/Date/DateClassifierArgs.cs @@ -1,6 +1,6 @@ -using PicSort.Core.Storage; +using FileSort.Core.Storage; -namespace PicSort.Core.Classifiers.Date +namespace FileSort.Core.Classifiers.Date { public class DateClassifierArgs: ClassifierArgs { diff --git a/src/PicSort.Core/Classifiers/Date/DateExtensions.cs b/src/FileSort.Core/Classifiers/Date/DateExtensions.cs similarity index 94% rename from src/PicSort.Core/Classifiers/Date/DateExtensions.cs rename to src/FileSort.Core/Classifiers/Date/DateExtensions.cs index 31dc5ed..310da87 100644 --- a/src/PicSort.Core/Classifiers/Date/DateExtensions.cs +++ b/src/FileSort.Core/Classifiers/Date/DateExtensions.cs @@ -1,6 +1,6 @@ using System; -namespace PicSort.Core.Classifiers.Date +namespace FileSort.Core.Classifiers.Date { public static class DateExtensions { diff --git a/src/PicSort.Core/Classifiers/Date/DateInterval.cs b/src/FileSort.Core/Classifiers/Date/DateInterval.cs similarity index 72% rename from src/PicSort.Core/Classifiers/Date/DateInterval.cs rename to src/FileSort.Core/Classifiers/Date/DateInterval.cs index 006a96b..c7dcdea 100644 --- a/src/PicSort.Core/Classifiers/Date/DateInterval.cs +++ b/src/FileSort.Core/Classifiers/Date/DateInterval.cs @@ -1,4 +1,4 @@ -namespace PicSort.Core.Classifiers.Date +namespace FileSort.Core.Classifiers.Date { public enum DateInterval { diff --git a/src/PicSort.Core/Classifiers/Date/RecursiveMode.cs b/src/FileSort.Core/Classifiers/Date/RecursiveMode.cs similarity index 90% rename from src/PicSort.Core/Classifiers/Date/RecursiveMode.cs rename to src/FileSort.Core/Classifiers/Date/RecursiveMode.cs index 80768fa..ed41cef 100644 --- a/src/PicSort.Core/Classifiers/Date/RecursiveMode.cs +++ b/src/FileSort.Core/Classifiers/Date/RecursiveMode.cs @@ -1,4 +1,4 @@ -namespace PicSort.Core.Classifiers.Date +namespace FileSort.Core.Classifiers.Date { public enum RecursiveMode { diff --git a/src/PicSort.Core/Classifiers/MediaFileInfo.cs b/src/FileSort.Core/Classifiers/MediaFileInfo.cs similarity index 87% rename from src/PicSort.Core/Classifiers/MediaFileInfo.cs rename to src/FileSort.Core/Classifiers/MediaFileInfo.cs index 4c584b5..b97fdf6 100644 --- a/src/PicSort.Core/Classifiers/MediaFileInfo.cs +++ b/src/FileSort.Core/Classifiers/MediaFileInfo.cs @@ -1,6 +1,6 @@ using System; -namespace PicSort.Core.Classifiers +namespace FileSort.Core.Classifiers { public class MediaFileInfo { diff --git a/src/PicSort.Core/DirectoryTools/DirectoryBuilder.cs b/src/FileSort.Core/DirectoryTools/DirectoryBuilder.cs similarity index 81% rename from src/PicSort.Core/DirectoryTools/DirectoryBuilder.cs rename to src/FileSort.Core/DirectoryTools/DirectoryBuilder.cs index 9d44f14..cf0df50 100644 --- a/src/PicSort.Core/DirectoryTools/DirectoryBuilder.cs +++ b/src/FileSort.Core/DirectoryTools/DirectoryBuilder.cs @@ -1,9 +1,9 @@ -using PicSort.Core.Classifiers; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers; +using FileSort.Core.Classifiers.Date; using System.IO; -namespace PicSort.Core.DirectoryTools +namespace FileSort.Core.DirectoryTools { public static class DirectoryBuilder { diff --git a/src/PicSort.Core/PicSort.Core.csproj b/src/FileSort.Core/FileSort.Core.csproj similarity index 100% rename from src/PicSort.Core/PicSort.Core.csproj rename to src/FileSort.Core/FileSort.Core.csproj diff --git a/src/PicSort.Core/Storage/ClassifierArgs.cs b/src/FileSort.Core/Storage/ClassifierArgs.cs similarity index 69% rename from src/PicSort.Core/Storage/ClassifierArgs.cs rename to src/FileSort.Core/Storage/ClassifierArgs.cs index ae49d8d..90eb8df 100644 --- a/src/PicSort.Core/Storage/ClassifierArgs.cs +++ b/src/FileSort.Core/Storage/ClassifierArgs.cs @@ -1,6 +1,6 @@ -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers.Date; -namespace PicSort.Core.Storage +namespace FileSort.Core.Storage { public abstract class ClassifierArgs { diff --git a/src/PicSort.Core/Storage/IStorageUtilities.cs b/src/FileSort.Core/Storage/IStorageUtilities.cs similarity index 75% rename from src/PicSort.Core/Storage/IStorageUtilities.cs rename to src/FileSort.Core/Storage/IStorageUtilities.cs index 4086d27..9073664 100644 --- a/src/PicSort.Core/Storage/IStorageUtilities.cs +++ b/src/FileSort.Core/Storage/IStorageUtilities.cs @@ -1,8 +1,8 @@ -using PicSort.Core.Classifiers; +using FileSort.Core.Classifiers; using System.Collections.Generic; -namespace PicSort.Core.Storage +namespace FileSort.Core.Storage { public interface IStorageUtilities { diff --git a/src/PicSort.Core/Storage/StorageManager.cs b/src/FileSort.Core/Storage/StorageManager.cs similarity index 92% rename from src/PicSort.Core/Storage/StorageManager.cs rename to src/FileSort.Core/Storage/StorageManager.cs index 5070944..fab3d98 100644 --- a/src/PicSort.Core/Storage/StorageManager.cs +++ b/src/FileSort.Core/Storage/StorageManager.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; -using PicSort.Core.Classifiers; +using FileSort.Core.Classifiers; -namespace PicSort.Core.Storage +namespace FileSort.Core.Storage { public class StorageManager { diff --git a/src/PicSort.Core/Storage/StorageUtilities.cs b/src/FileSort.Core/Storage/StorageUtilities.cs similarity index 96% rename from src/PicSort.Core/Storage/StorageUtilities.cs rename to src/FileSort.Core/Storage/StorageUtilities.cs index af7cbd5..7d96858 100644 --- a/src/PicSort.Core/Storage/StorageUtilities.cs +++ b/src/FileSort.Core/Storage/StorageUtilities.cs @@ -1,12 +1,12 @@ -using PicSort.Core.Classifiers; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers; +using FileSort.Core.Classifiers.Date; using System; using System.IO; using System.Linq; using System.Collections.Generic; -namespace PicSort.Core.Storage +namespace FileSort.Core.Storage { public class StorageUtilities : IStorageUtilities { diff --git a/src/PicSort.CLI/reinstall.bat b/src/PicSort.CLI/reinstall.bat deleted file mode 100644 index 34e8664..0000000 --- a/src/PicSort.CLI/reinstall.bat +++ /dev/null @@ -1,5 +0,0 @@ -dotnet tool uninstall -g picsort.cli -dotnet build -dotnet pack -dotnet tool install --global --add-source ./nupkg picsort.cli -pause \ No newline at end of file diff --git a/tests/PicSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs b/tests/FileSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs similarity index 95% rename from tests/PicSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs rename to tests/FileSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs index 4de12dc..585905e 100644 --- a/tests/PicSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs +++ b/tests/FileSort.Core.UnitTests/Classifiers/DateClassifierTests/ClasifyShould.cs @@ -1,7 +1,7 @@ using FluentAssertions; -using PicSort.Core.Classifiers; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers; +using FileSort.Core.Classifiers.Date; using System; @@ -9,7 +9,7 @@ using Xunit; -namespace PicSort.Core.UnitTests.Classifiers.DateClassifierTests +namespace FileSort.Core.UnitTests.Classifiers.DateClassifierTests { public class ClasifyShould { diff --git a/tests/PicSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs b/tests/FileSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs similarity index 95% rename from tests/PicSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs rename to tests/FileSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs index 86e59ea..f29b79e 100644 --- a/tests/PicSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs +++ b/tests/FileSort.Core.UnitTests/Classifiers/DateExtensionsShould.cs @@ -1,13 +1,13 @@ using FluentAssertions; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers.Date; using System; using System.Collections.Generic; using Xunit; -namespace PicSort.Core.UnitTests.Classifiers +namespace FileSort.Core.UnitTests.Classifiers { public class DateExtensionsShould { diff --git a/tests/PicSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs b/tests/FileSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs similarity index 91% rename from tests/PicSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs rename to tests/FileSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs index 53eee4b..dccedf8 100644 --- a/tests/PicSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs +++ b/tests/FileSort.Core.UnitTests/Classifiers/DirectoryBuilderShould.cs @@ -1,14 +1,14 @@ using FluentAssertions; -using PicSort.Core.Classifiers; -using PicSort.Core.DirectoryTools; -using PicSort.Core.Classifiers.Date; +using FileSort.Core.Classifiers; +using FileSort.Core.DirectoryTools; +using FileSort.Core.Classifiers.Date; using System; using Xunit; -namespace PicSort.Core.UnitTests.Classifiers +namespace FileSort.Core.UnitTests.Classifiers { public class DirectoryBuilderShould { diff --git a/tests/PicSort.Core.UnitTests/PicSort.Core.UnitTests.csproj b/tests/FileSort.Core.UnitTests/FileSort.Core.UnitTests.csproj similarity index 90% rename from tests/PicSort.Core.UnitTests/PicSort.Core.UnitTests.csproj rename to tests/FileSort.Core.UnitTests/FileSort.Core.UnitTests.csproj index f8e381b..a2e80ce 100644 --- a/tests/PicSort.Core.UnitTests/PicSort.Core.UnitTests.csproj +++ b/tests/FileSort.Core.UnitTests/FileSort.Core.UnitTests.csproj @@ -17,7 +17,7 @@ - + diff --git a/tests/PicSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs b/tests/FileSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs similarity index 91% rename from tests/PicSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs rename to tests/FileSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs index eac67af..14c4e7f 100644 --- a/tests/PicSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs +++ b/tests/FileSort.Core.UnitTests/Storage/StorageOrganizer/OrganizeDirectoryShould.cs @@ -1,11 +1,11 @@ using Moq; -using PicSort.Core.Classifiers; -using PicSort.Core.Classifiers.Date; -using PicSort.Core.Storage; +using FileSort.Core.Classifiers; +using FileSort.Core.Classifiers.Date; +using FileSort.Core.Storage; using System.Collections.Generic; using Xunit; -namespace PicSort.Core.UnitTests.Storage.StorageOrganizer +namespace FileSort.Core.UnitTests.Storage.StorageOrganizer { public class OrganizeDirectoryShould {