Merge pull request #18 from matthewstrasiotto/rename_linux_2

Rename VideoDuplicateFinderLinux => VideoDuplicateFinder.gui
strazto · Jul 17, 2021 · b7e017b · b7e017b
2 parents 0975a93 + 7d67fd7
commit b7e017b
Show file tree

Hide file tree

Showing 25 changed files with 42 additions and 75 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.8.9002
+2.0.8.9003
diff --git a/VideoDuplicateFinderLinux/App.xaml → VideoDuplicateFinder.gui/App.xaml b/VideoDuplicateFinderLinux/App.xaml → VideoDuplicateFinder.gui/App.xaml
@@ -1,6 +1,6 @@
 <Application xmlns="https://github.com/avaloniaui"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- x:Class="VideoDuplicateFinderLinux.App">
+ x:Class="VideoDuplicateFinder.gui.App">
  <Application.Styles>
  <StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
  <StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>

diff --git a/VideoDuplicateFinderLinux/App.xaml.cs → VideoDuplicateFinder.gui/App.xaml.cs b/VideoDuplicateFinderLinux/App.xaml.cs → VideoDuplicateFinder.gui/App.xaml.cs
@@ -5,7 +5,7 @@
 using Avalonia.Logging.Serilog;
 using Avalonia.Markup.Xaml;
 
-namespace VideoDuplicateFinderLinux
+namespace VideoDuplicateFinder.gui
 {
  public class App : Application
  {

diff --git a/...uplicateFinderLinux/ApplicationHelpers.cs → ...DuplicateFinder.gui/ApplicationHelpers.cs b/...uplicateFinderLinux/ApplicationHelpers.cs → ...DuplicateFinder.gui/ApplicationHelpers.cs
@@ -1,7 +1,7 @@
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
  static class ApplicationHelpers {
  public static IClassicDesktopStyleApplicationLifetime CurrentApplicationLifetime =>
  (IClassicDesktopStyleApplicationLifetime)Application.Current.ApplicationLifetime;

diff --git a/...icateFinderLinux/DuplicateItemComparer.cs → ...licateFinder.gui/DuplicateItemComparer.cs b/...icateFinderLinux/DuplicateItemComparer.cs → ...licateFinder.gui/DuplicateItemComparer.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace VideoDuplicateFinderLinux
+namespace VideoDuplicateFinder.gui
 {
  public sealed class DuplicateItemComparer : IComparer<DuplicateItemViewModel>
  {

diff --git a/...cateFinderLinux/DuplicateItemViewModel.cs → ...icateFinder.gui/DuplicateItemViewModel.cs b/...cateFinderLinux/DuplicateItemViewModel.cs → ...icateFinder.gui/DuplicateItemViewModel.cs
@@ -4,7 +4,7 @@
 using Avalonia.Media;
 using Avalonia.Media.Imaging;
 
-namespace VideoDuplicateFinderLinux
+namespace VideoDuplicateFinder.gui
 {
  public class DuplicateItemViewModel : ReactiveObject, IEquatable<DuplicateItemViewModel>
  {

diff --git a/...licateFinderLinux/DuplicateViewModel.xaml → ...plicateFinder.gui/DuplicateViewModel.xaml b/...licateFinderLinux/DuplicateViewModel.xaml → ...plicateFinder.gui/DuplicateViewModel.xaml
@@ -1,6 +1,6 @@
 <UserControl xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 
- x:Class="VideoDuplicateFinderLinux.DuplicateViewModel" 
+ x:Class="VideoDuplicateFinder.gui.DuplicateViewModel" 
  xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity"
  xmlns:ia="clr-namespace:Avalonia.Xaml.Interactions.Core;assembly=Avalonia.Xaml.Interactions">
  <Grid>

diff --git a/...ateFinderLinux/DuplicateViewModel.xaml.cs → ...cateFinder.gui/DuplicateViewModel.xaml.cs b/...ateFinderLinux/DuplicateViewModel.xaml.cs → ...cateFinder.gui/DuplicateViewModel.xaml.cs
@@ -1,7 +1,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace VideoDuplicateFinderLinux
+namespace VideoDuplicateFinder.gui
 {
  public class DuplicateViewModel : UserControl
  {

diff --git a/...ux/MVVM/Converters/NegateBoolConverter.cs → ...ui/MVVM/Converters/NegateBoolConverter.cs b/...ux/MVVM/Converters/NegateBoolConverter.cs → ...ui/MVVM/Converters/NegateBoolConverter.cs
@@ -2,7 +2,7 @@
 using System;
 using System.Globalization;
 
-namespace VideoDuplicateFinderLinux.MVVM.Converters
+namespace VideoDuplicateFinder.gui.MVVM.Converters
 {
  public class NegateBoolConverter : IValueConverter
 

diff --git a/VideoDuplicateFinderLinux/MainWindow.xaml → VideoDuplicateFinder.gui/MainWindow.xaml b/VideoDuplicateFinderLinux/MainWindow.xaml → VideoDuplicateFinder.gui/MainWindow.xaml
@@ -1,9 +1,9 @@
 <Window
- x:Class="VideoDuplicateFinderLinux.MainWindow" xmlns="https://github.com/avaloniaui"
+ x:Class="VideoDuplicateFinder.gui.MainWindow" xmlns="https://github.com/avaloniaui"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
  xmlns:duplicateFinderEngine="clr-namespace:DuplicateFinderEngine;assembly=DuplicateFinderEngine"
- xmlns:local="clr-namespace:VideoDuplicateFinderLinux"
- xmlns:mvvm="clr-namespace:VideoDuplicateFinderLinux.MVVM.Converters"
+ xmlns:local="clr-namespace:VideoDuplicateFinder.gui"
+ xmlns:mvvm="clr-namespace:VideoDuplicateFinder.gui.MVVM.Converters"
  Title="Video Duplicate Finder 2.0 - Cross-platform"
  Width="900"
  Height="750"

diff --git a/VideoDuplicateFinderLinux/MainWindow.xaml.cs → VideoDuplicateFinder.gui/MainWindow.xaml.cs b/VideoDuplicateFinderLinux/MainWindow.xaml.cs → VideoDuplicateFinder.gui/MainWindow.xaml.cs
@@ -2,7 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Markup.Xaml;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
  public class MainWindow : Window {
  public MainWindow() {
  InitializeComponent();

diff --git a/VideoDuplicateFinderLinux/MainWindowVM.cs → VideoDuplicateFinder.gui/MainWindowVM.cs b/VideoDuplicateFinderLinux/MainWindowVM.cs → VideoDuplicateFinder.gui/MainWindowVM.cs
@@ -18,7 +18,7 @@
 using System.Reactive;
 using System.Diagnostics;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
  public sealed class MainWindowVM : ReactiveObject {
 
  public ScanEngine Scanner { get; } = new ScanEngine();

diff --git a/...oDuplicateFinderLinux/MessageBoxView.xaml → VideoDuplicateFinder.gui/MessageBoxView.xaml b/...oDuplicateFinderLinux/MessageBoxView.xaml → VideoDuplicateFinder.gui/MessageBoxView.xaml
@@ -1,10 +1,10 @@
 <Window
  xmlns="https://github.com/avaloniaui"
  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
- x:Class="VideoDuplicateFinderLinux.MessageBoxView"
+ x:Class="VideoDuplicateFinder.gui.MessageBoxView"
  xmlns:duplicateFinderEngine="clr-namespace:DuplicateFinderEngine;assembly=DuplicateFinderEngine"
- xmlns:local="clr-namespace:VideoDuplicateFinderLinux"
- xmlns:mvvm="clr-namespace:VideoDuplicateFinderLinux.MVVM.Converters"
+ xmlns:local="clr-namespace:VideoDuplicateFinder.gui"
+ xmlns:mvvm="clr-namespace:VideoDuplicateFinder.gui.MVVM.Converters"
  Title="{Binding Title}"
  MinWidth="400"
  MaxWidth="600"

diff --git a/...plicateFinderLinux/MessageBoxView.xaml.cs → ...uplicateFinder.gui/MessageBoxView.xaml.cs b/...plicateFinderLinux/MessageBoxView.xaml.cs → ...uplicateFinder.gui/MessageBoxView.xaml.cs
@@ -6,7 +6,7 @@
 using Avalonia.Markup.Xaml;
 using ReactiveUI;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
 
  public static class MessageBoxService {
  public static async Task<MessageBoxButtons> Show(string message, MessageBoxButtons buttons = MessageBoxButtons.Ok,

diff --git a/VideoDuplicateFinderLinux/Program.cs → VideoDuplicateFinder.gui/Program.cs b/VideoDuplicateFinderLinux/Program.cs → VideoDuplicateFinder.gui/Program.cs
@@ -2,7 +2,7 @@
 using Avalonia.Logging.Serilog;
 using Avalonia.ReactiveUI;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
  class Program {
  static void Main(string[] args) => BuildAvaloniaApp().StartWithClassicDesktopLifetime(args);
 

diff --git a/...nux/Properties/PublishProfiles/x64.pubxml → ...gui/Properties/PublishProfiles/x64.pubxml b/...nux/Properties/PublishProfiles/x64.pubxml → ...gui/Properties/PublishProfiles/x64.pubxml
diff --git a/...derLinux/Properties/Resources.Designer.cs → ...nder.gui/Properties/Resources.Designer.cs b/...derLinux/Properties/Resources.Designer.cs → ...nder.gui/Properties/Resources.Designer.cs
diff --git a/...cateFinderLinux/Properties/Resources.resx → ...icateFinder.gui/Properties/Resources.resx b/...cateFinderLinux/Properties/Resources.resx → ...icateFinder.gui/Properties/Resources.resx
diff --git a/VideoDuplicateFinderLinux/Utils.cs → VideoDuplicateFinder.gui/Utils.cs b/VideoDuplicateFinderLinux/Utils.cs → VideoDuplicateFinder.gui/Utils.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using Avalonia.Media.Imaging;
 
-namespace VideoDuplicateFinderLinux {
+namespace VideoDuplicateFinder.gui {
  static class Utils {
  public static string ThumbnailDirectory => DuplicateFinderEngine.Utils.SafePathCombine(Path.GetDirectoryName(typeof(MainWindow).Assembly.Location), "Thumbnails");
  public static Bitmap JoinImages(List<System.Drawing.Image> pImgList) {

diff --git a/...derLinux/VideoDuplicateFinderLinux.csproj → ...inder.gui/VideoDuplicateFinder.gui.csproj b/...derLinux/VideoDuplicateFinderLinux.csproj → ...inder.gui/VideoDuplicateFinder.gui.csproj
@@ -25,9 +25,6 @@
  <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
  <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.9.9" />
  <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\DuplicateFinderEngine\DuplicateFinderEngine.csproj" />
  </ItemGroup> 
  <ItemGroup>
  <Compile Update="MessageBoxView.xaml.cs">
@@ -56,4 +53,7 @@
  <Generator>MSBuild:Compile</Generator>
  </None>
  </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\DuplicateFinderEngine\DuplicateFinderEngine.csproj" />
+ </ItemGroup>
 </Project>
diff --git a/VideoDuplicateFinderLinux/icon.ico → VideoDuplicateFinder.gui/icon.ico b/VideoDuplicateFinderLinux/icon.ico → VideoDuplicateFinder.gui/icon.ico
diff --git a/VideoDuplicateFinderLinux/nuget.config → VideoDuplicateFinder.gui/nuget.config b/VideoDuplicateFinderLinux/nuget.config → VideoDuplicateFinder.gui/nuget.config
diff --git a/VideoDuplicateFinderLinux/VideoDuplicateFinderLinux.sln b/VideoDuplicateFinderLinux/VideoDuplicateFinderLinux.sln
diff --git a/VideoDuplicateFinderWindows.sln b/VideoDuplicateFinderWindows.sln
@@ -9,10 +9,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DuplicateFinderEngine", "Du
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VideoDuplicateFinder.Console", "VideoDuplicateFinder.Console\VideoDuplicateFinder.Console.csproj", "{B2048B76-21C3-4C40-8F42-0B18F1F61540}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VideoDuplicateFinderLinux", "VideoDuplicateFinderLinux\VideoDuplicateFinderLinux.csproj", "{E6C3460C-ECAE-42CF-B6B7-EA665E142F89}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoDuplicateFinder.Web", "VideoDuplicateFinder.Web\VideoDuplicateFinder.Web.csproj", "{21FD4237-2C93-4C2C-ABB4-0D571502CD9A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VideoDuplicateFinder.gui", "VideoDuplicateFinder.gui\VideoDuplicateFinder.gui.csproj", "{97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -45,14 +45,6 @@ Global
  {B2048B76-21C3-4C40-8F42-0B18F1F61540}.Release|Any CPU.Build.0 = Release|Any CPU
  {B2048B76-21C3-4C40-8F42-0B18F1F61540}.Release|x64.ActiveCfg = Release|Any CPU
  {B2048B76-21C3-4C40-8F42-0B18F1F61540}.Release|x64.Build.0 = Release|Any CPU
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Debug|x64.ActiveCfg = Debug|x64
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Debug|x64.Build.0 = Debug|x64
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Release|Any CPU.Build.0 = Release|Any CPU
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Release|x64.ActiveCfg = Release|x64
- {E6C3460C-ECAE-42CF-B6B7-EA665E142F89}.Release|x64.Build.0 = Release|x64
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -61,6 +53,14 @@ Global
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Release|Any CPU.Build.0 = Release|Any CPU
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Release|x64.ActiveCfg = Release|Any CPU
  {21FD4237-2C93-4C2C-ABB4-0D571502CD9A}.Release|x64.Build.0 = Release|Any CPU
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Debug|x64.ActiveCfg = Debug|x64
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Debug|x64.Build.0 = Debug|x64
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Release|x64.ActiveCfg = Release|x64
+ {97E83DBF-8AEA-4A4E-BCE9-7EA005FEB09C}.Release|x64.Build.0 = Release|x64
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/build.sh b/build.sh
@@ -59,25 +59,17 @@ function publish {
 
 # Publish for windows
 
-PLATFORM=win-x64
-PROJECTS=("VideoDuplicateFinder.Windows" "VideoDuplicateFinder.Web" "VideoDuplicateFinder.Console")
 BASE_DIR="Releases"
+PLATFORMS=(win-x64 linux-x64 osx.10.11-x64)
+PROJECTS=("VideoDuplicateFinder.gui" "VideoDuplicateFinder.Web" "VideoDuplicateFinder.Console")
 
 rm -r $BASE_DIR/VDF*
 
-for project in ${PROJECTS[@]}; do
- echo "========== ${project}-${PLATFORM} ============================"
- publish "$PLATFORM" "$project" "$BASE_DIR"
-done
-
-# Publish for linux
-
-PLATFORM=linux-x64
-PROJECTS=("VideoDuplicateFinderLinux" "VideoDuplicateFinder.Web" "VideoDuplicateFinder.Console")
-
-for project in ${PROJECTS[@]}; do
- echo "========== ${project}-${PLATFORM} ============================"
- publish "$PLATFORM" "$project" "$BASE_DIR"
+for PLATFORM in ${PLATFORMS[@]}; do
+ for project in ${PROJECTS[@]}; do
+ echo "========== ${project}-${PLATFORM} ============================"
+ publish "$PLATFORM" "$project" "$BASE_DIR"
+ done
 done
 
 # Zip each project