From ebcd7d18c419d271296faaa48f2ce0a13396b550 Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 19:37:45 +0100 Subject: [PATCH 1/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20z=20backupem=20jedne?= =?UTF-8?q?go=20pliku=20-=20brak=20\?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 2 ++ "AutoBackup/schedule \342\200\224 kopia.dat" | 1 - AutoBackup/schedule.dat | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 "AutoBackup/schedule \342\200\224 kopia.dat" delete mode 100644 AutoBackup/schedule.dat diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index 10ed2cb..72f85c9 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -47,6 +47,8 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) HANDLE inputHandle, outputHandle; DWORD inputBytes, outputBytes; CHAR buffer[bufferSize]; + if (destination.back() != '\\') + destination += "\\"; destination.append(findFileData.cFileName); FindClose(findHandle); inputHandle = CreateFile(source.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); diff --git "a/AutoBackup/schedule \342\200\224 kopia.dat" "b/AutoBackup/schedule \342\200\224 kopia.dat" deleted file mode 100644 index c36d9ae..0000000 --- "a/AutoBackup/schedule \342\200\224 kopia.dat" +++ /dev/null @@ -1 +0,0 @@ -21-12-2020 14:31:00 01 00:00 c: c: 1 diff --git a/AutoBackup/schedule.dat b/AutoBackup/schedule.dat deleted file mode 100644 index be9db3c..0000000 --- a/AutoBackup/schedule.dat +++ /dev/null @@ -1 +0,0 @@ -23-12-2020 02:31:00 01 12:00 c: c: 1 From 8532b4ae108c29842b21e0ed0895cb2f1b9c3e25 Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 22:29:53 +0100 Subject: [PATCH 2/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20backupu=20-=20usuni?= =?UTF-8?q?=C4=99cie=20znaku=20\=20z=20ci=C4=85gu=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index 72f85c9..b6bbb1f 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -21,6 +21,8 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) HANDLE findHandle = FindFirstFile(source.c_str(), &findFileData); if (findHandle != INVALID_HANDLE_VALUE) { + if (source.back() == '\\') + source.pop_back(); bool success = false; if (findFileData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) { From 86ce7690b6175c7844822c8a52970dcf7398b914 Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 22:50:35 +0100 Subject: [PATCH 3/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20backupu=20folder?= =?UTF-8?q?=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index b6bbb1f..de9f7d5 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -17,12 +17,12 @@ void TaskExecutor::execute(std::vector tasks) void TaskExecutor::DoBackup(string source, string destination, bool compress) { + if (source.back() == '\\') + source.pop_back(); WIN32_FIND_DATAA findFileData; HANDLE findHandle = FindFirstFile(source.c_str(), &findFileData); if (findHandle != INVALID_HANDLE_VALUE) { - if (source.back() == '\\') - source.pop_back(); bool success = false; if (findFileData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) { From 3495d00bad931c508e1ec03098a109657a582f74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw?= <61850108+Fariusz@users.noreply.github.com> Date: Wed, 3 Feb 2021 15:42:13 +0100 Subject: [PATCH 4/9] Dodano komentarze --- AutoBackupConsole/Dialog.cpp | 4 ++-- AutoBackupConsole/schedule.dat | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/AutoBackupConsole/Dialog.cpp b/AutoBackupConsole/Dialog.cpp index c5978bf..a7b321a 100644 --- a/AutoBackupConsole/Dialog.cpp +++ b/AutoBackupConsole/Dialog.cpp @@ -25,7 +25,7 @@ Command Dialog::showMainDialog() case Command::Stop: stopAutoBackupProcess(); break; case Command::ShowSchedule: showSchedule(); break; case Command::NewTask: createNewBackupTask(); break; - case Command::ClearTasks: clearTasks(); break; + case Command::ClearTasks: clearTasks(); break; //Usuwa wpisy do harmonogramu case Command::Shutdown: break; } return command; @@ -161,7 +161,7 @@ void Dialog::saveTask(const BackupProperties& backup) ofs.close(); } -void Dialog::clearTasks() +void Dialog::clearTasks() //Funkcja nadpisuje plik z harmonogramem w celu usunięcia zaplanowanych zadań { std::ofstream ofs; ofs.open("schedule.dat", std::ofstream::out | std::ofstream::trunc); diff --git a/AutoBackupConsole/schedule.dat b/AutoBackupConsole/schedule.dat index e69de29..9d25d21 100644 --- a/AutoBackupConsole/schedule.dat +++ b/AutoBackupConsole/schedule.dat @@ -0,0 +1 @@ +03-02-2021 16:00:00 00 00:01 C:\test C:\test_bak 0 From 6175e8505c9325d17514b3203b7352f4df49b36b Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 19:37:45 +0100 Subject: [PATCH 5/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20z=20backupem=20jedne?= =?UTF-8?q?go=20pliku=20-=20brak=20\?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index 7dd705f..236f3db 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -140,6 +140,8 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) HANDLE inputHandle, outputHandle; DWORD inputBytes, outputBytes; CHAR buffer[bufferSize]; + if (destination.back() != '\\') + destination += "\\"; destination.append(findFileData.cFileName); FindClose(findHandle); inputHandle = CreateFile(source.c_str(), GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); From 2c98ae0f00bc73f7221c68c200f229c244f85630 Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 22:29:53 +0100 Subject: [PATCH 6/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20backupu=20-=20usuni?= =?UTF-8?q?=C4=99cie=20znaku=20\=20z=20ci=C4=85gu=20source?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index 236f3db..b8a58e2 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -114,6 +114,8 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) HANDLE findHandle = FindFirstFile(source.c_str(), &findFileData); if (findHandle != INVALID_HANDLE_VALUE) { + if (source.back() == '\\') + source.pop_back(); bool success = false; if (findFileData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) { From 2365e82b8ec1958b74c525e93fa474a252b23599 Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Tue, 2 Feb 2021 22:50:35 +0100 Subject: [PATCH 7/9] =?UTF-8?q?Naprawa=20b=C5=82edu=20backupu=20folder?= =?UTF-8?q?=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index b8a58e2..cfa6f14 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -110,12 +110,12 @@ DWORD WINAPI MyThreadFunction(LPVOID lpParam) void TaskExecutor::DoBackup(string source, string destination, bool compress) { + if (source.back() == '\\') + source.pop_back(); WIN32_FIND_DATAA findFileData; HANDLE findHandle = FindFirstFile(source.c_str(), &findFileData); if (findHandle != INVALID_HANDLE_VALUE) { - if (source.back() == '\\') - source.pop_back(); bool success = false; if (findFileData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) { From e4c1d7928aa587a762dce2f275dbfe49171b9cab Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Wed, 3 Feb 2021 16:30:42 +0100 Subject: [PATCH 8/9] Zmiana string na char* w strukturze threadData --- AutoBackup/TaskExecutor.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index 9fb4ece..b3396e6 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -28,8 +28,8 @@ DWORD WINAPI MyThreadFunction(LPVOID lpParam); //Struktura danych do przekazywania parametrów do wątków typedef struct threadData { - string srcDir; - string destDir; + char* srcDir; + char* destDir; bool compress = false; }MYDATA, * PMYDATA; //Przekazywanie przez pusty wskaźnik LPVOID, można stosować dowolny typ danych From e1081bc3d5a49c0eb2ff6ba0fc05d014e383492e Mon Sep 17 00:00:00 2001 From: Jacek Barc Date: Wed, 3 Feb 2021 16:33:19 +0100 Subject: [PATCH 9/9] =?UTF-8?q?Usuni=C4=99cie=20zb=C4=99dnych=20komunikat?= =?UTF-8?q?=C3=B3w=20z=20DoBackup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoBackup/TaskExecutor.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/AutoBackup/TaskExecutor.cpp b/AutoBackup/TaskExecutor.cpp index b3396e6..b22e37a 100644 --- a/AutoBackup/TaskExecutor.cpp +++ b/AutoBackup/TaskExecutor.cpp @@ -139,11 +139,8 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) source.pop_back(); WIN32_FIND_DATAA findFileData; HANDLE findHandle = FindFirstFile(source.c_str(), &findFileData); - cout << "Source: " << source << endl; - cout << "Error: " << GetLastError() << endl; if (findHandle != INVALID_HANDLE_VALUE) { - cout << "Attr: " << findFileData.dwFileAttributes << endl; bool success = false; if (findFileData.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY) @@ -153,11 +150,9 @@ void TaskExecutor::DoBackup(string source, string destination, bool compress) source += "\\"; source += "*.*"; source.append(1, '\0'); - cout << "Source append: " << source << endl; if (destination.back() != '\\') destination += "\\"; destination.append(1, '\0'); - //std::cout << source << " " << destination << endl; SHFILEOPSTRUCT shFileOperationStructure = { 0 }; shFileOperationStructure.wFunc = FO_COPY; shFileOperationStructure.fFlags = FOF_SILENT;