Merge pull request #11 from Hlebushek2020/merge-collections

Hlebushek2020 · web-flow · commit 48dd07e967d5 · 2022-01-21T20:49:13.000+03:00
diff --git a/ImageCollection/Classes/Collections/Collection.cs b/ImageCollection/Classes/Collections/Collection.cs
@@ -111,6 +111,15 @@ public void AddIgnorRules(string item, bool inCurrentFolder, Guid? parent, Colle
             //actualItems.Add(item, itemMeta);
         }
 
+        /// <summary>
+        /// Добавление элемента в список удаленных
+        /// </summary>
+        /// <param name="item">Элемент</param>
+        public void AddIrrelevantItem(string item)
+        {
+            irrelevantItems.Add(item);
+        }
+
         /// <summary>
         /// Очистка коллекции, указывающей, какие элементы были исключены из актуальных
         /// </summary>
@@ -145,7 +154,7 @@ public void Remove(string item)
         /// <param name="item">Элемент</param>
         public void RemoveIgnorRules(string item) =>
             actualItems.TryRemove(item, out _);
-            //actualItems.Remove(item);
+        //actualItems.Remove(item);
 
 
         /// <summary>
diff --git a/ImageCollection/Classes/Collections/CollectionItemMeta.cs b/ImageCollection/Classes/Collections/CollectionItemMeta.cs
@@ -8,7 +8,7 @@ public class CollectionItemMeta
         public Guid? Parent { get; private set; }
         public string Hash { get; set; }
         public string Description { get; set; }
-        
+
         public CollectionItemMeta(bool inCurrentFolder, Guid? parent)
         {
             InCurrentFolder = inCurrentFolder;
diff --git a/ImageCollection/Classes/Collections/CollectionStore.cs b/ImageCollection/Classes/Collections/CollectionStore.cs
@@ -1,6 +1,5 @@
 ﻿using ImageCollection.Classes.ItemMovers;
 using ImageCollection.Classes.Settings;
-using ImageCollection.Classes.Views;
 using ImageCollection.Structures;
 using System;
 using System.Collections.Generic;
diff --git a/ImageCollection/Classes/Converters/HotkeyConverter.cs b/ImageCollection/Classes/Converters/HotkeyConverter.cs
@@ -1,11 +1,7 @@
 ﻿using ImageCollection.Structures;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 
 namespace ImageCollection.Classes.Converters
diff --git a/ImageCollection/Classes/Settings/ProgramSettings.cs b/ImageCollection/Classes/Settings/ProgramSettings.cs
@@ -1,7 +1,7 @@
-﻿using System;
+﻿using Newtonsoft.Json;
+using System;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
 
 namespace ImageCollection.Classes.Settings
 {
diff --git a/ImageCollection/Classes/Settings/StoreSettings.cs b/ImageCollection/Classes/Settings/StoreSettings.cs
@@ -1,13 +1,10 @@
 ﻿using ImageCollection.Classes.Collections;
 using ImageCollection.Structures;
 using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
 
 namespace ImageCollection.Classes.Settings
 {
diff --git a/ImageCollection/Classes/Views/ComboBoxModifierKey.cs b/ImageCollection/Classes/Views/ComboBoxModifierKey.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
+﻿using System.Windows.Input;
 
 namespace ImageCollection.Classes.Views
 {
diff --git a/ImageCollection/Classes/Views/ListBoxImageItem.cs b/ImageCollection/Classes/Views/ListBoxImageItem.cs
@@ -19,7 +19,7 @@ public string Path
                 path = value;
                 OnPropertyChanged();
             }
-        } 
+        }
 
         public BitmapImage Preview
         {
diff --git a/ImageCollection/Enums/StartWork.cs b/ImageCollection/Enums/StartWork.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ImageCollection.Enums
+﻿namespace ImageCollection.Enums
 {
     public enum StartWork : byte
     {
diff --git a/ImageCollection/Enums/TaskType.cs b/ImageCollection/Enums/TaskType.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ImageCollection.Enums
+﻿namespace ImageCollection.Enums
 {
     public enum TaskType : byte
     {
@@ -13,6 +7,7 @@ public enum TaskType : byte
         SaveCollections,
         Distribution,
         RenameCollectionItems,
-        СlearImageCache
+        СlearImageCache,
+        MergeCollections
     }
 }
diff --git a/ImageCollection/Properties/AssemblyInfo.cs b/ImageCollection/Properties/AssemblyInfo.cs
@@ -1,6 +1,4 @@
 ﻿using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -51,5 +49,5 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.0.0")]
-[assembly: AssemblyFileVersion("1.2.0.0")]
+[assembly: AssemblyVersion("1.2.1.0")]
+[assembly: AssemblyFileVersion("1.2.1.0")]
diff --git a/ImageCollection/Structures/CollectionInformation.cs b/ImageCollection/Structures/CollectionInformation.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ImageCollection.Structures
+﻿namespace ImageCollection.Structures
 {
     public struct CollectionInformation
     {
diff --git a/ImageCollection/Structures/CollectionKeyInformation.cs b/ImageCollection/Structures/CollectionKeyInformation.cs
@@ -1,11 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace ImageCollection.Structures
+﻿namespace ImageCollection.Structures
 {
     public struct CollectionKeyInformation
     {
diff --git a/ImageCollection/Structures/OpenFolderArgs.cs b/ImageCollection/Structures/OpenFolderArgs.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.IO;
 
 namespace ImageCollection.Structures
 {
diff --git a/ImageCollection/Windows/CollectionHotkeyEditWindow.xaml.cs b/ImageCollection/Windows/CollectionHotkeyEditWindow.xaml.cs
@@ -1,20 +1,11 @@
 ﻿using ImageCollection.Classes.Collections;
 using ImageCollection.Classes.Views;
 using ImageCollection.Structures;
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ImageCollection
 {
diff --git a/ImageCollection/Windows/CollectionHotkeyWindow.xaml.cs b/ImageCollection/Windows/CollectionHotkeyWindow.xaml.cs
@@ -1,19 +1,8 @@
 ﻿using ImageCollection.Classes.Collections;
 using ImageCollection.Structures;
-using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ImageCollection
 {
diff --git a/ImageCollection/Windows/CollectionInformationEditorWindow.xaml.cs b/ImageCollection/Windows/CollectionInformationEditorWindow.xaml.cs
@@ -1,19 +1,8 @@
 ﻿using ImageCollection.Classes.Collections;
 using ImageCollection.Structures;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ImageCollection
 {
@@ -67,7 +56,7 @@ public CollectionInformationEditorWindow(string collectionName, string collectio
             }
         }
 
-        public CollectionInformation GetCollectionInformation() => 
+        public CollectionInformation GetCollectionInformation() =>
             new CollectionInformation(textBox_collectionName.Text, changedCollectionName, textBox_collectionDescription.Text, changedCollectionDescription);
 
         private void Button_Apply_Click(object sender, RoutedEventArgs e)
diff --git a/ImageCollection/Windows/MainWindow.xaml b/ImageCollection/Windows/MainWindow.xaml
@@ -30,6 +30,7 @@
                 <MenuItem Header="Изменить" InputGestureText="Ctrl + E" Click="MenuItem_EditCollectionDetails_Click"/>
                 <MenuItem Header="Удалить" InputGestureText="Ctrl + Delete" Click="MenuItem_RemoveCollection_Click"/>
                 <Separator/>
+                <MenuItem Header="Слияние" Click="MenuItem_MergeCollections_Click"/>
                 <MenuItem Header="Распределить по папкам" InputGestureText="Ctrl + D" Click="MenuItem_DistributeFolders_Click"/>
                 <MenuItem Header="Переименовать файлы" InputGestureText="Ctrl + F2" Click="MenuItem_RenameAllItemsInCollection_Click"/>
                 <MenuItem Header="Горячие клавиши" InputGestureText="Ctrl + H" Click="MenuItem_CollectionHotkey_Click"/>
diff --git a/ImageCollection/Windows/MainWindow.xaml.cs b/ImageCollection/Windows/MainWindow.xaml.cs
@@ -695,5 +695,25 @@ private void MenuItem_CollectionHotkey_Click(object sender, RoutedEventArgs e)
                 collectionHotkey.ShowDialog();
             }
         }
+
+        private void MenuItem_MergeCollections_Click(object sender, RoutedEventArgs e)
+        {
+            using (System.Windows.Forms.FolderBrowserDialog fbd = new System.Windows.Forms.FolderBrowserDialog { ShowNewFolderButton = false })
+            {
+                if (fbd.ShowDialog() == System.Windows.Forms.DialogResult.OK)
+                {
+                    if (File.Exists(Path.Combine(fbd.SelectedPath, CollectionStore.DataDirectoryName, $"{CollectionStore.BaseCollectionId}.icd")))
+                    {
+                        TaskProgressWindow progressWindow = new TaskProgressWindow(TaskType.MergeCollections, new object[] { fbd.SelectedPath });
+                        progressWindow.ShowDialog();
+                        RefreshAfterOpening();
+                    }
+                    else
+                    {
+                        Classes.UI.MessageBox.Show("Данные о коллекциях не обнаружены. Продолжение операции невозможно.", App.Name, MessageBoxButton.OK, MessageBoxImage.Warning);
+                    }
+                }
+            }
+        }
     }
 }
diff --git a/ImageCollection/Windows/MessageBoxWindow.xaml.cs b/ImageCollection/Windows/MessageBoxWindow.xaml.cs
@@ -1,16 +1,7 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ImageCollection
 {
diff --git a/ImageCollection/Windows/SelectCollectionWindow.xaml.cs b/ImageCollection/Windows/SelectCollectionWindow.xaml.cs
@@ -11,7 +11,7 @@ public partial class SelectCollectionWindow : Window
         private readonly string currentCollectionName;
 
         public bool IsApply { get; private set; } = false;
-        
+
         public SelectCollectionWindow(string currentCollectionName)
         {
             InitializeComponent();
diff --git a/ImageCollection/Windows/StartWindow.xaml.cs b/ImageCollection/Windows/StartWindow.xaml.cs
@@ -1,18 +1,6 @@
 ﻿using ImageCollection.Classes.Settings;
 using ImageCollection.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace ImageCollection
 {
diff --git a/ImageCollection/Windows/TaskProgressWindow.xaml.cs b/ImageCollection/Windows/TaskProgressWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class CollectionItemMeta`
`8`	`8`	`public Guid? Parent { get; private set; }`
`9`	`9`	`public string Hash { get; set; }`
`10`	`10`	`public string Description { get; set; }`
`11`		`-`
	`11`	`+`
`12`	`12`	`public CollectionItemMeta(bool inCurrentFolder, Guid? parent)`
`13`	`13`	`{`
`14`	`14`	`InCurrentFolder = inCurrentFolder;`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`		`-using System;`
	`1`	`+using Newtonsoft.Json;`
	`2`	`+using System;`
`2`	`3`	`using System.IO;`
`3`	`4`	`using System.Text;`
`4`		`-using Newtonsoft.Json;`
`5`	`5`
`6`	`6`	`namespace ImageCollection.Classes.Settings`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public string Path`
`19`	`19`	`path = value;`
`20`	`20`	`OnPropertyChanged();`
`21`	`21`	`}`
`22`		`- }`
	`22`	`+ }`
`23`	`23`
`24`	`24`	`public BitmapImage Preview`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`		`-`
`7`		`-namespace ImageCollection.Enums`
	`1`	`+namespace ImageCollection.Enums`
`8`	`2`	`{`
`9`	`3`	`public enum StartWork : byte`
`10`	`4`	`{`