From 22b8f9183ad5f6055e53c85fac40912963e7af32 Mon Sep 17 00:00:00 2001 From: chrisheib Date: Tue, 30 Jan 2018 22:48:35 +0100 Subject: [PATCH] correction for rename on import --- NW-Spendenmonitor/DonationImporter.cs | 9 ++++++++- NW-Spendenmonitor/Form1.cs | 4 +++- .../bin/Release/NW-Spendenmonitor.exe | Bin 29184 -> 29696 bytes 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/NW-Spendenmonitor/DonationImporter.cs b/NW-Spendenmonitor/DonationImporter.cs index 9d75fe9..67f4246 100644 --- a/NW-Spendenmonitor/DonationImporter.cs +++ b/NW-Spendenmonitor/DonationImporter.cs @@ -8,7 +8,7 @@ namespace NW_Spendenmonitor static class DonationImporter { - public static int ImportCSVToInput(SQLiteConnection dbConnect, string path, bool rename, int language) + public static int ImportCSVToInput(SQLiteConnection dbConnect, string path, bool rename, int language, string oldpath) { List donationList = CSVReader.ReadCSV(path); @@ -59,12 +59,19 @@ public static int ImportCSVToInput(SQLiteConnection dbConnect, string path, bool changedLines++; } + // find last date if (string.Compare(donationLine.Time, maxDateInFile) > 0) { maxDateInFile = donationLine.Time; } + } + + if (oldpath != "") + { + System.IO.File.Delete(path); + path = oldpath; } if (rename) diff --git a/NW-Spendenmonitor/Form1.cs b/NW-Spendenmonitor/Form1.cs index 8949a7e..70fdf47 100644 --- a/NW-Spendenmonitor/Form1.cs +++ b/NW-Spendenmonitor/Form1.cs @@ -71,6 +71,7 @@ private void Button3_Click(object sender, EventArgs e) SetStatus("Importiere " + openFileDialog1.FileName + ", bitte warten!"); string path = openFileDialog1.FileName; + string oldpath = ""; ConfigClass.ImportLanguage = cbLanguage.SelectedIndex; @@ -80,13 +81,14 @@ private void Button3_Click(object sender, EventArgs e) case 0: break; case 1: + oldpath = path; ImportLanguageManager.PrepareFileGerman(ref path); break; default: break; } - string changedLines = Convert.ToString(DonationImporter.ImportCSVToInput(dbConnection, path, checkBox1.Checked, cbLanguage.SelectedIndex)); + string changedLines = Convert.ToString(DonationImporter.ImportCSVToInput(dbConnection, path, checkBox1.Checked, cbLanguage.SelectedIndex, oldpath)); SetStatus("Import von " + openFileDialog1.FileName + " abgeschlossen, " + changedLines + " Einträge hinzugefügt!"); StatementToGrid("select * from input order by time desc limit " + changedLines, true); } diff --git a/NW-Spendenmonitor/bin/Release/NW-Spendenmonitor.exe b/NW-Spendenmonitor/bin/Release/NW-Spendenmonitor.exe index 5b98bd90696c6367bdd0a9e7047b444cefb5a47c..de4c076dbba0b3a116d3c47ee15b30a63fbce4cd 100644 GIT binary patch delta 5801 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 delta 5718 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 P{KTMkEA=^BSLym6Fp4XL