From 08b0288421b2cd69bbfd8a8a109572f04df69bbe Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Mon, 21 Sep 2020 21:52:17 +0100 Subject: New upstream version 2.2.4.7 --- plugins/CopyEngine/Random/informations.xml | 2 +- plugins/CopyEngine/Rsync/informations.xml | 2 +- .../Ultracopier-Spec/CopyEngine.pro.user.4.9-pre1 | 322 +++++++++++++++++++++ .../Ultracopier-Spec/Languages/ar/translation.qm | Bin .../Ultracopier-Spec/Languages/ar/translation.ts | 26 +- .../Ultracopier-Spec/Languages/de/translation.qm | Bin .../Ultracopier-Spec/Languages/de/translation.ts | 26 +- .../Ultracopier-Spec/Languages/el/translation.qm | Bin .../Ultracopier-Spec/Languages/el/translation.ts | 26 +- .../Ultracopier-Spec/Languages/en/translation.qm | Bin .../Ultracopier-Spec/Languages/en/translation.ts | 26 +- .../Ultracopier-Spec/Languages/es/translation.qm | Bin .../Ultracopier-Spec/Languages/es/translation.ts | 26 +- .../Ultracopier-Spec/Languages/fr/translation.qm | Bin .../Ultracopier-Spec/Languages/fr/translation.ts | 26 +- .../Ultracopier-Spec/Languages/hi/translation.qm | Bin .../Ultracopier-Spec/Languages/hi/translation.ts | 26 +- .../Ultracopier-Spec/Languages/hu/translation.qm | Bin .../Ultracopier-Spec/Languages/hu/translation.ts | 26 +- .../Ultracopier-Spec/Languages/id/translation.qm | Bin .../Ultracopier-Spec/Languages/id/translation.ts | 26 +- .../Ultracopier-Spec/Languages/it/translation.qm | Bin .../Ultracopier-Spec/Languages/it/translation.ts | 26 +- .../Ultracopier-Spec/Languages/ja/translation.qm | Bin .../Ultracopier-Spec/Languages/ja/translation.ts | 26 +- .../Ultracopier-Spec/Languages/ko/translation.qm | Bin .../Ultracopier-Spec/Languages/ko/translation.ts | 26 +- .../Ultracopier-Spec/Languages/nl/translation.qm | Bin .../Ultracopier-Spec/Languages/nl/translation.ts | 26 +- .../Ultracopier-Spec/Languages/no/translation.qm | Bin .../Ultracopier-Spec/Languages/no/translation.ts | 26 +- .../Ultracopier-Spec/Languages/pl/translation.qm | Bin .../Ultracopier-Spec/Languages/pl/translation.ts | 26 +- .../Ultracopier-Spec/Languages/pt/translation.qm | Bin .../Ultracopier-Spec/Languages/pt/translation.ts | 26 +- .../Ultracopier-Spec/Languages/ru/translation.qm | Bin .../Ultracopier-Spec/Languages/ru/translation.ts | 26 +- .../Ultracopier-Spec/Languages/th/translation.qm | Bin .../Ultracopier-Spec/Languages/th/translation.ts | 26 +- .../Ultracopier-Spec/Languages/tr/translation.qm | Bin .../Ultracopier-Spec/Languages/tr/translation.ts | 26 +- .../Ultracopier-Spec/Languages/zh/translation.qm | Bin .../Ultracopier-Spec/Languages/zh/translation.ts | 26 +- .../Ultracopier-Spec/ScanFileOrFolder.cpp | 18 +- .../CopyEngine/Ultracopier-Spec/TransferThread.cpp | 20 +- .../Ultracopier-Spec/async/TransferThreadAsync.cpp | 17 +- .../CopyEngine/Ultracopier-Spec/informations.xml | 2 +- 47 files changed, 620 insertions(+), 283 deletions(-) create mode 100755 plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro.user.4.9-pre1 mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.qm mode change 100755 => 100644 plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.qm (limited to 'plugins/CopyEngine') diff --git a/plugins/CopyEngine/Random/informations.xml b/plugins/CopyEngine/Random/informations.xml index 01595f8..88f79bd 100755 --- a/plugins/CopyEngine/Random/informations.xml +++ b/plugins/CopyEngine/Random/informations.xml @@ -15,7 +15,7 @@ - 2.2.4.5 + 2.2.4.7 Random diff --git a/plugins/CopyEngine/Rsync/informations.xml b/plugins/CopyEngine/Rsync/informations.xml index 2d92504..92f21c7 100755 --- a/plugins/CopyEngine/Rsync/informations.xml +++ b/plugins/CopyEngine/Rsync/informations.xml @@ -17,7 +17,7 @@ - 2.2.4.5 + 2.2.4.7 Rsync diff --git a/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro.user.4.9-pre1 b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro.user.4.9-pre1 new file mode 100755 index 0000000..98fe325 --- /dev/null +++ b/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro.user.4.9-pre1 @@ -0,0 +1,322 @@ + + + + + + EnvironmentId + {74ab603f-f657-4135-92cf-c93af71b2f91} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + 1 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + true + + + + ProjectExplorer.Project.PluginSettings + + + true + false + Builtin.Clazy + + /home/user/Desktop/ultracopier/sources/plugins/CopyEngine/Ultracopier-Spec/CopyEngine.pro + + + + false + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {23178a1c-09be-4e9f-9aab-ff55e05e7637} + 0 + 0 + 0 + + /home/user/Desktop/ultracopier/sources/plugins/CopyEngine/build-CopyEngine-Desktop-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/user/Desktop/ultracopier/sources/plugins/CopyEngine/build-CopyEngine-Desktop-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/user/Desktop/ultracopier/sources/plugins/CopyEngine/build-CopyEngine-Desktop-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + false + + + false + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + true + clean + + false + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + + + + ProjectExplorer.CustomExecutableRunConfiguration + + 3768 + false + true + false + false + true + + + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 20 + + + Version + 20 + + diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts index a94fa18..d2b3fda 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ar/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1-نسخ - - + + %1 - copy (%2) %1 - نسخ (%2) - - + + %name% - copy %اسم% - نسخ - - + + %name% - copy (%number%) % الاسم%-النسخة (% العدد%) - - + + Problem with folder read مشكله في قراءه المجلد @@ -626,13 +626,13 @@ - + File not found الملف غير موجود - - + + Unable to change the date غير قادر على تغيير التاريخ diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts index dc9f497..0a32a65 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/de/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - Kopie - - + + %1 - copy (%2) %1 - Kopie (%2) - - + + %name% - copy %name% - Kopie - - + + %name% - copy (%number%) %name% - Kopie (%number%) - - + + Problem with folder read Problem beim Lesen des Ordners @@ -626,13 +626,13 @@ - + File not found Datei nicht gefunden - - + + Unable to change the date Kann Datum nicht ändern diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/el/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts index 4a444fe..7bb754e 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/en/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts index aad6412..3565910 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/es/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - copia - - + + %1 - copy (%2) %1 - copia (%2) - - + + %name% - copy %name% - copia - - + + %name% - copy (%number%) %name% - copia (%number%) - - + + Problem with folder read Problema con la carpeta leída @@ -626,13 +626,13 @@ - + File not found Archivo no encontrado - - + + Unable to change the date No se puede cambiar la fecha diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts index 6bec60f..19789ff 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/fr/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - copie - - + + %1 - copy (%2) %1 - copie (%2) - - + + %name% - copy %name% - copie - - + + %name% - copy (%number%) %name% - copie (%number%) - - + + Problem with folder read Probléme avec la lecture du dossier @@ -626,7 +626,7 @@ - + File not found Fichier non trouvé @@ -636,8 +636,8 @@ Essaie de renommage avec caratéres interdits - - + + Unable to change the date Impossible de changer la date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hi/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts index b7dde65..5df5fab 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/hu/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - másolás - - + + %1 - copy (%2) %1 - másolás (%2) - - + + %name% - copy %name% - másolás - - + + %name% - copy (%number%) %name% - másolás (%number%) - - + + Problem with folder read @@ -626,7 +626,7 @@ - + File not found Fájl nem található @@ -636,8 +636,8 @@ Átnevezés speciális karakterek használatával - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/id/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts index bedc49e..89d53ff 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/it/translation.ts @@ -585,32 +585,32 @@ ScanFileOrFolder - - + + %1 - copy Copia di %1 - - + + %1 - copy (%2) Copia di %1 (%2) - - + + %name% - copy Copia di %name% - - + + %name% - copy (%number%) Copia di %name% (%number%) - - + + Problem with folder read Problema con la lettura della cartella @@ -629,7 +629,7 @@ - + File not found File non trovato @@ -639,8 +639,8 @@ Tenta ridenominazione usando caratteri speciali - - + + Unable to change the date Impossibile cambiare data diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts index a771060..ebb1c5a 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ja/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts index a33466b..74fbf13 100644 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ko/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - 복사 - - + + %1 - copy (%2) %1 - 복사 (%2) - - + + %name% - copy %name% - 복사 - - + + %name% - copy (%number%) %name% - 복사 (%number%) - - + + Problem with folder read 폴더 읽기 문제 @@ -626,13 +626,13 @@ - + File not found 파일을 찾을 수 없습니다. - - + + Unable to change the date 날짜를 변경할 수 없습니다. diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/nl/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/no/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pl/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/pt/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts index 2115820..5ca2037 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/ru/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy %1 - копия - - + + %1 - copy (%2) %1 - копия (%2) - - + + %name% - copy %name% - копия - - + + %name% - copy (%number%) %name% - копия (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/th/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts index ef5da14..f608b09 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/tr/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.qm b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.qm old mode 100755 new mode 100644 diff --git a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts index a771060..ebb1c5a 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts +++ b/plugins/CopyEngine/Ultracopier-Spec/Languages/zh/translation.ts @@ -582,32 +582,32 @@ ScanFileOrFolder - - + + %1 - copy - - + + %1 - copy (%2) - - + + %name% - copy - - + + %name% - copy (%number%) - - + + Problem with folder read @@ -626,13 +626,13 @@ - + File not found - - + + Unable to change the date diff --git a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp index 014585d..b1d8ed2 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/ScanFileOrFolder.cpp @@ -331,9 +331,14 @@ void ScanFileOrFolder::run() INTERNALTYPEPATH ScanFileOrFolder::resolvDestination(const INTERNALTYPEPATH &destination) { INTERNALTYPEPATH temp(destination); - char buf[PATH_MAX]; + std::vector buf(512); ssize_t nbytes=0; - nbytes=readlink(TransferThread::internalStringTostring(destination).c_str(), buf, sizeof(buf)); + do { + buf.resize(buf.size()*2); + nbytes=readlink(TransferThread::internalStringTostring(destination).c_str(), buf.data(), buf.size()); + } while (nbytes == (ssize_t)buf.size()); + if (nbytes!=-1) + buf.resize(nbytes); while(nbytes!=-1) { temp=FSabsolutePath(temp); if(!stringEndsWith(destination,'/') @@ -342,14 +347,19 @@ INTERNALTYPEPATH ScanFileOrFolder::resolvDestination(const INTERNALTYPEPATH &des #endif ) temp+=TransferThread::stringToInternalString("/"); - temp+=TransferThread::stringToInternalString(std::string(buf,nbytes)); + temp+=TransferThread::stringToInternalString(std::string(buf.data(), buf.size())); /// \todo change for pure c++ code #ifdef WIDESTRING temp=QFileInfo(QString::fromStdWString(temp)).absoluteFilePath().toStdWString(); #else temp=QFileInfo(QString::fromStdString(temp)).absoluteFilePath().toStdString(); #endif - nbytes=readlink(TransferThread::internalStringTostring(temp).c_str(), buf, sizeof(buf)); + do { + buf.resize(buf.size() * 2); + nbytes=readlink(TransferThread::internalStringTostring(temp).c_str(), buf.data(), buf.size()); + } while (nbytes == (ssize_t)buf.size()); + if (nbytes!=-1) + buf.resize(nbytes); } return temp; /*do diff --git a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp index 9cbad5a..d986b49 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/TransferThread.cpp @@ -737,8 +737,7 @@ bool TransferThread::mkpath(const INTERNALTYPEPATH &path) } while(!pathSplit.empty()); return true; #else - char pathC[PATH_MAX]; - strcpy(pathC,TransferThread::internalStringTostring(path).c_str()); + std::string pathC(TransferThread::internalStringTostring(path)); if(!mkdir(path)) if(errno==EEXIST) return true; @@ -748,8 +747,7 @@ bool TransferThread::mkpath(const INTERNALTYPEPATH &path) std::string::size_type previouspos=path.size(); std::string::size_type lastpos=std::string::npos; - char pathCedit[PATH_MAX]; - strcpy(pathCedit,pathC); + std::string pathCedit(pathC); std::vector pathSplit; pathSplit.push_back(path.size()); do @@ -773,14 +771,14 @@ bool TransferThread::mkpath(const INTERNALTYPEPATH &path) return false; #endif - pathCedit[lastpos]='\0'; + pathCedit.resize(lastpos); previouspos=lastpos; errno=0; #ifdef Q_OS_UNIX - if(::mkdir(pathCedit, mode)==-1) + if(::mkdir(pathCedit.c_str(), mode)==-1) #else - if(::mkdir(pathCedit)==-1) + if(::mkdir(pathCedit.c_str())==-1) #endif if(errno!=EEXIST && errno!=ENOENT) return false; @@ -791,14 +789,14 @@ bool TransferThread::mkpath(const INTERNALTYPEPATH &path) do { - strcpy(pathCedit,pathC); + pathCedit = pathC; lastpos=pathSplit.back(); pathSplit.pop_back(); - pathCedit[lastpos]='\0'; + pathCedit.resize(lastpos); #ifdef Q_OS_UNIX - if(::mkdir(pathCedit, mode)==-1) + if(::mkdir(pathCedit.c_str(), mode)==-1) #else - if(::mkdir(pathCedit)==-1) + if(::mkdir(pathCedit.c_str())==-1) #endif if(errno!=EEXIST) return false; diff --git a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp index b5af928..e52bc7f 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp +++ b/plugins/CopyEngine/Ultracopier-Spec/async/TransferThreadAsync.cpp @@ -620,9 +620,16 @@ void TransferThreadAsync::ifCanStartTransfer() return; } } - char buf[PATH_MAX]; - const ssize_t s=readlink(TransferThread::internalStringTostring(source).c_str(),buf,sizeof(buf)); - buf[s]=0x00; + std::vector buf(512); + ssize_t s=0; + do { + buf.resize(buf.size()*2); + s=readlink(TransferThread::internalStringTostring(source).c_str(),buf.data(),buf.size()); + } while (s == (ssize_t)buf.size()); + if (s!=-1) { + buf.resize(s + 1); + buf[s]='\0'; + } if(s<0) { const int terr=errno; @@ -638,12 +645,12 @@ void TransferThreadAsync::ifCanStartTransfer() } else { - if(symlink(buf,TransferThread::internalStringTostring(destination).c_str())!=0) + if(symlink(buf.data(),TransferThread::internalStringTostring(destination).c_str())!=0) { const int terr=errno; const std::string &strError=strerror(terr); ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"["+std::to_string(id)+"] stop copy in error "+ - buf+"->"+TransferThread::internalStringTostring(destination)+ + buf.data()+"->"+TransferThread::internalStringTostring(destination)+ " "+strError+"("+std::to_string(terr)+")" ); readError=true; diff --git a/plugins/CopyEngine/Ultracopier-Spec/informations.xml b/plugins/CopyEngine/Ultracopier-Spec/informations.xml index dbd8f66..d906bfb 100755 --- a/plugins/CopyEngine/Ultracopier-Spec/informations.xml +++ b/plugins/CopyEngine/Ultracopier-Spec/informations.xml @@ -17,7 +17,7 @@ - 2.2.4.5 + 2.2.4.7 Ultracopier Spec -- cgit v1.2.3