Make TabularData::contentIdentityOf identify more aggressively

graphia-app · Aug 15, 2023 · 987f579 · 987f579
1 parent 186e50f
commit 987f579
Showing 1 changed file with 16 additions and 17 deletions.
diff --git a/source/shared/loading/tabulardata.cpp b/source/shared/loading/tabulardata.cpp
@@ -248,6 +248,7 @@ QString TabularData::contentIdentityOf(const QUrl& url)
 
     const int maxLines = 50;
     int numLinesScanned = 0;
+    std::map<char, size_t> counts;
 
     std::istream* is = nullptr;
     do
@@ -256,7 +257,6 @@ QString TabularData::contentIdentityOf(const QUrl& url)
 
         is = &u::getline(file, line);
 
-        std::map<char, size_t> counts;
         bool inQuotes = false;
 
         for(auto character : line)
@@ -278,25 +278,24 @@ QString TabularData::contentIdentityOf(const QUrl& url)
             }
         }
 
-        if(!counts.empty())
-        {
-            auto maxCount = std::max_element(counts.begin(), counts.end(),
-                [](const auto& a, const auto& b) { return a.second < b.second; });
+        numLinesScanned++;
+    } while(!is->fail() && !is->eof() &&
+        numLinesScanned < maxLines);
 
-            auto character = maxCount->first;
+    if(!counts.empty())
+    {
+        auto maxCount = std::max_element(counts.begin(), counts.end(),
+            [](const auto& a, const auto& b) { return a.second < b.second; });
 
-            switch(character)
-            {
-            case ',':  identity = u"CSV"_s; break;
-            case ';':  identity = u"SSV"_s; break;
-            case '\t': identity = u"TSV"_s; break;
-            }
-        }
+        auto character = maxCount->first;
 
-        numLinesScanned++;
-    } while(identity.isEmpty() &&
-        !is->fail() && !is->eof() &&
-        numLinesScanned < maxLines);
+        switch(character)
+        {
+        case ',':  identity = u"CSV"_s; break;
+        case ';':  identity = u"SSV"_s; break;
+        case '\t': identity = u"TSV"_s; break;
+        }
+    }
 
     return identity;
 }