[chronojump] exportFiles copy images refactorized, and done for sprint
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] exportFiles copy images refactorized, and done for sprint
- Date: Thu, 25 Mar 2021 12:52:58 +0000 (UTC)
commit 5190a9be2fb89d8822f341bdacb14118bfe67289
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Mar 25 13:52:37 2021 +0100
exportFiles copy images refactorized, and done for sprint
src/exportFiles/exportFiles.cs | 22 ++++++++++++++++++++++
src/exportFiles/fs.cs | 38 ++++++--------------------------------
src/exportFiles/re.cs | 25 ++++---------------------
src/exportFiles/sprint.cs | 6 ++----
4 files changed, 34 insertions(+), 57 deletions(-)
---
diff --git a/src/exportFiles/exportFiles.cs b/src/exportFiles/exportFiles.cs
index 5c309973..8804a0b9 100644
--- a/src/exportFiles/exportFiles.cs
+++ b/src/exportFiles/exportFiles.cs
@@ -184,6 +184,28 @@ public abstract class ExportFiles
return true;
}
+ protected bool copyImages(string sourceFolderURL, string exportURL, string destFolderName)
+ {
+ LogB.Information("going to copy export files with images ...");
+ if( ! Directory.Exists(exportURL))
+ Directory.CreateDirectory (exportURL);
+
+ try {
+ DirectoryInfo sourceDirInfo = new DirectoryInfo(sourceFolderURL);
+ string destFolderURL = Path.Combine(exportURL, destFolderName);
+
+ Directory.CreateDirectory (destFolderURL);
+
+ foreach (FileInfo file in sourceDirInfo.GetFiles())
+ file.CopyTo(destFolderURL, true);
+ } catch {
+ return false;
+ }
+
+ LogB.Information("done copy export files with images!");
+ return true;
+ }
+
protected abstract void setProgressBarTextAndFractionPrepare (int fileCount);
//forceSensor inherits different
diff --git a/src/exportFiles/fs.cs b/src/exportFiles/fs.cs
index fefa41e9..a5c98d41 100644
--- a/src/exportFiles/fs.cs
+++ b/src/exportFiles/fs.cs
@@ -349,38 +349,12 @@ public class ForceSensorExport : ExportFiles
if(cancel)
return false;
- if(includeImages)
- {
- LogB.Information("going to copy export files with images ...");
- if( ! Directory.Exists(exportURL))
- Directory.CreateDirectory (exportURL);
-
- try{
- // 1) rfd graphs
- string sourceFolder = getTempGraphsDir();
- DirectoryInfo sourceDirInfo = new DirectoryInfo(sourceFolder);
-
- string destFolder = Path.Combine(exportURL,
"chronojump_force_sensor_export_graphs_rfd");
- Directory.CreateDirectory (destFolder);
-
- foreach (FileInfo file in sourceDirInfo.GetFiles())
- file.CopyTo(destFolder, true);
-
- // 2) AB graphs
- sourceFolder = getTempGraphsABDir();
- sourceDirInfo = new DirectoryInfo(sourceFolder);
-
- destFolder = Path.Combine(exportURL,
"chronojump_force_sensor_export_graphs_ab");
- Directory.CreateDirectory (destFolder);
-
- foreach (FileInfo file in sourceDirInfo.GetFiles())
- file.CopyTo(destFolder, true);
- } catch {
- return false;
- }
-
- //LogB.Information("done copy export files with images!");
- }
+ if(includeImages && ! copyImages(getTempGraphsDir(), exportURL,
+ "chronojump_force_sensor_export_graphs_rfd"))
+ return false;
+ if(includeImages && ! copyImages(getTempGraphsABDir(), exportURL,
+ "chronojump_force_sensor_export_graphs_ab"))
+ return false;
//copy the CSV
File.Copy(getTempCSVFileName(), exportURL, true);
diff --git a/src/exportFiles/re.cs b/src/exportFiles/re.cs
index b86ecee0..e4640cb2 100644
--- a/src/exportFiles/re.cs
+++ b/src/exportFiles/re.cs
@@ -205,27 +205,10 @@ public class RunEncoderExport : ExportFiles
if(cancel)
return false;
- if(includeImages)
- {
- LogB.Information("going to copy export files with images ...");
- if( ! Directory.Exists(exportURL))
- Directory.CreateDirectory (exportURL);
-
- try{
- string sourceFolder = getTempGraphsDir();
- DirectoryInfo sourceDirInfo = new DirectoryInfo(sourceFolder);
-
- string destFolder = Path.Combine(exportURL,
"chronojump_race_analyzer_export_graphs");
- Directory.CreateDirectory (destFolder);
-
- foreach (FileInfo file in sourceDirInfo.GetFiles())
- file.CopyTo(destFolder, true);
- } catch {
- return false;
- }
-
- //LogB.Information("done copy export files with images!");
- }
+ //copy the images if needed
+ if(includeImages && ! copyImages(getTempGraphsDir(), exportURL,
+ "chronojump_race_analyzer_export_graphs"))
+ return false;
// copy the CSV
File.Copy(RunEncoder.GetCSVResultsFileName(), exportURL, true);
diff --git a/src/exportFiles/sprint.cs b/src/exportFiles/sprint.cs
index 39dcb5b9..ac784379 100644
--- a/src/exportFiles/sprint.cs
+++ b/src/exportFiles/sprint.cs
@@ -169,10 +169,8 @@ public class SprintExport : ExportFiles
if(cancel)
return false;
- if(includeImages)
- {
- //TODO
- }
+ if(includeImages && ! copyImages(getTempGraphsDir(), exportURL,
+ "chronojump_races_sprint_export_graphs"));
// copy the CSV
File.Copy(RunInterval.GetCSVResultsFileName(), exportURL, true);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]