public AutosarFileDiffCollection(AutosarFileCollection collection1, AutosarFileCollection collection2, string folder)
        {
            this.collection1 = collection1;
            this.collection2 = collection2;
            this.Folder = folder;

            if (Directory.Exists(folder))
            {
                this.Empty(new DirectoryInfo(folder));
            }

            Directory.CreateDirectory(folder);

            this.CreateDiffCollection();
        }
Esempio n. 2
0
        private static void Main(string[] args)
        {
            AutosarFileCollection collection = new AutosarFileCollection();
            collection.ParseFiles(new DirectoryInfo(Directory.GetCurrentDirectory() + "\\c"));

            AutosarFileCollection collection2 = new AutosarFileCollection();
            collection2.ParseFiles(new DirectoryInfo(Directory.GetCurrentDirectory() + "\\c1"));

            AutosarFileDiffCollection diff = new AutosarFileDiffCollection(collection, collection2, "temp");

            foreach (var diffEntry in diff.GetAllDifferences())
            {
                CreateDiff(diffEntry.FirstFile, diffEntry.SecondFile, diffEntry.DiffFile);
                File.Copy(diffEntry.FirstFile, diffEntry.DiffOriginalFile);
            }

            //var f1 =
            //    @"D:\Systems\Autosar-Merger\ConsoleApplication1\bin\Debug\c1\Config\Developer\ComponentTypes\SwcTnk.arxml";
            //var f2 = @"D:\Systems\Autosar-Merger\ConsoleApplication1\bin\Debug\c\Config\Developer\ComponentTypes\SwcTnk.arxml";
            //var f3 = "out1.xml";

            //CreateDiff(f1, f2, f3);
            //File.Copy(f1, "out1111.xml");
            //ApplyDiff(f1, f3, "out1111.xml");

            //ZipData.UnZip("config_p1.zip", "c");
            //ZipData.UnZip("config_p2.zip", "c1");
            //ZipData.UnZip("config_p2.zip", "result");

            //string[] array1 = Directory.GetFiles(Directory.GetCurrentDirectory() + "\\c", "*.arxml", SearchOption.AllDirectories);
            //string[] array2 = Directory.GetFiles(Directory.GetCurrentDirectory() + "\\c1", "*.arxml", SearchOption.AllDirectories);
            //string[] arrayResult = Directory.GetFiles(Directory.GetCurrentDirectory() + "\\result", "*.arxml", SearchOption.AllDirectories);

            //for (int i = 0; i < array1.Length; i++)
            //{
            //    if (FileCompare(array1[i], array2[i]) == false)
            //    {
            //        //var originalDoc = XDocument.Load(array1[i]);
            //        //var changedDoc = XDocument.Load(array2[i]);

            //        //File.Delete(arrayResult[i]);
            //        //using (File.Create(arrayResult[i]))
            //        //{
            //        //}
            //        Console.WriteLine("Comparing {0} and {1}", array1[i], array2[i]);
            //        CreateDiff(array1[i], array2[i], arrayResult[i]);

            //        //ApplyDiff(array1[i], arrayResult[i], array2[i]);
            //        ////var resultDoc =
            //    }
            //}

            //for (int i = 0; i < array1.Length; i++)
            //{
            //    if (FileCompare(array1[i], array2[i]) == false)
            //    {
            //        try
            //        {
            //          Console.WriteLine("Diff {0} and {1}", array1[i], array2[i]);
            //          ApplyDiff(array1[i], arrayResult[i], array1[i]);
            //        }
            //        catch (Exception)
            //        {
            //            Console.WriteLine("ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
            //        }

            //    }
            //}

            /*

                    */
        }