From 58eee793bd48a558c275cac04ec576b7e6666b26 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 24 八月 2023 16:09:02 +0800
Subject: [PATCH] 修改获取文件大小的方法

---
 DataLoader/CS/Importor.cs |   58 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/DataLoader/CS/Importor.cs b/DataLoader/CS/Importor.cs
index 0b399c1..c41ffed 100644
--- a/DataLoader/CS/Importor.cs
+++ b/DataLoader/CS/Importor.cs
@@ -91,13 +91,15 @@
         /// </summary>
         private static void SetSysMeta(ViewData vd)
         {
+            long sizes = GetFileSizes(vd);
+
             SysMeta meta = new SysMeta();
             meta.eventid = Guid.NewGuid().ToString();
             meta.metaid = 0;
             meta.verid = 0;
             meta.guid = null;
             meta.path = vd.FilePath; // *
-            meta.sizes = GetFileSizes(vd);
+            meta.sizes = Tools.SizeToMb(sizes);
             meta.tab = null;
             meta.rows = 0;
             meta.create_user = CommonProp.UserId;
@@ -112,25 +114,35 @@
             meta.acq_time = CommonProp.AcqTime;
 
             vd.Meta = meta;
-            vd.Sizes = meta.sizes;
+            vd.Sizes = Tools.FormatBytes(sizes);
         }
 
         /// <summary>
         /// 鑾峰彇鏂囦欢澶у皬
         /// </summary>
-        private static double GetFileSizes(ViewData vd)
+        private static long GetFileSizes(ViewData vd)
         {
             if (File.Exists(vd.FilePath))
             {
-                if (vd.Ext == StaticData.SHP)
+                switch (vd.Ext)
                 {
-                    List<string> files = GetShpFiles(vd.FilePath);
-                    return GetFileSizes(files.ToArray());
-                }
-                else
-                {
-                    FileInfo fi = new FileInfo(vd.FilePath);
-                    return Tools.SizeToMb(fi.Length);
+                    case StaticData.MPT:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.MPT_EXT));
+                    case StaticData.JPG:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.JPG_EXT));
+                    case StaticData.JP2:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.JP2_EXT));
+                    case StaticData.IMG:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.IMG_EXT));
+                    case StaticData.TIF:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.TIF_EXT));
+                    case StaticData.TIFF:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.TIFF_EXT));
+                    case StaticData.SHP:
+                        return GetFileSizes(GetExtFiles(vd, StaticData.SHP_EXT));
+                    default:
+                        FileInfo fi = new FileInfo(vd.FilePath);
+                        return fi.Length;
                 }
             }
 
@@ -146,15 +158,15 @@
         /// <summary>
         /// 鑾峰彇鏂囦欢澶у皬
         /// </summary>
-        private static double GetFileSizes(string[] files)
+        private static long GetFileSizes(string[] files)
         {
             if (null == files || files.Length == 0) return 0;
 
-            double sizes = 0;
+            long sizes = 0;
             foreach (string file in files)
             {
                 FileInfo fi = new FileInfo(file);
-                sizes += Tools.SizeToMb(fi.Length);
+                sizes += fi.Length;
             }
 
             return sizes;
@@ -163,21 +175,21 @@
         /// <summary>
         /// 鑾峰彇SHP鏂囦欢闆嗗悎
         /// </summary>
-        private static List<string> GetShpFiles(string shpPath)
+        private static string[] GetExtFiles(ViewData vd, List<string> exts)
         {
             List<string> files = new List<string>();
-            files.Add(shpPath);
+            files.Add(vd.FilePath);
 
-            foreach (string ext in StaticData.SHP_EXT)
+            foreach (string ext in exts)
             {
-                string file = shpPath.Replace(".shp", ext);
+                string file = vd.FilePath.Replace(vd.Ext, ext);
                 if (File.Exists(file))
                 {
                     files.Add(file);
                 }
             }
 
-            return files;
+            return files.ToArray();
         }
 
         /// <summary>
@@ -277,8 +289,7 @@
             {
                 if (vd.Ext == StaticData.SHP)
                 {
-                    List<string> files = GetShpFiles(vd.FilePath);
-                    return GetFilesMD5(files.ToArray());
+                    return GetFilesMD5(GetExtFiles(vd, StaticData.SHP_EXT));
                 }
                 else
                 {
@@ -342,6 +353,9 @@
                 case StaticData.JPG:
                     copyMultiFile(vd, StaticData.JPG_EXT);
                     break;
+                case StaticData.JP2:
+                    copyMultiFile(vd, StaticData.JP2_EXT);
+                    break;
                 case StaticData.IMG:
                     copyMultiFile(vd, StaticData.IMG_EXT);
                     break;
@@ -383,7 +397,7 @@
             {
                 try
                 {
-                    string target=source.Replace(vd.FilePath, targetFolder);
+                    string target = source.Replace(vd.FilePath, targetFolder);
                     count++;
                 }
                 catch (Exception ex)

--
Gitblit v1.9.3