1.support json files(ELK logs);

2.support select multi record in context menu;
3.fix some bugs;

Author: fishjam

FTL/ftlFile.h

@@ -348,11 +348,19 @@ namespace FTL
 	typedef CFTextFile<CFFileUnicodeEncoding> CFUnicodeFile;
 	typedef CFTextFile<CFFileUTF8Encoding>    CFUTF8File;
 
+    enum PathType {
+        ptUnknown,      //未知: 比如没有权限访问其父目录
+        ptNotExist,     //指定的路径上没有 文件或目录(错误路径)
+        ptFile,     
+        ptFolder
+    };
+
     //有 ATLPath 实现了很多功能, 如 RemoveFileSpec(删除路径最后的文件名)
     class CFPath
     {
     public:
-		//创建指定路径中的全部目录
+        FTLINLINE static PathType GetPathType(LPCTSTR pszPath);
+        //创建指定路径中的全部目录
 		FTLINLINE static BOOL CreateDirTree(LPCTSTR szPath);
         FTLINLINE static BOOL GetRelativePath(LPCTSTR pszFullPath, LPCTSTR pszParentPath, LPTSTR pszRelateivePath, UINT cchMax);
 

FTL/ftlFile.hpp

@@ -897,6 +897,35 @@ namespace FTL
 		return 0;   // no support
 	}
 
+  	PathType CFPath::GetPathType(LPCTSTR pszPath)
+	{
+		PathType pathType = ptUnknown;
+		DWORD dwAttrib = GetFileAttributes(pszPath);
+		if (dwAttrib != INVALID_FILE_ATTRIBUTES)
+		{
+			if (dwAttrib & FILE_ATTRIBUTE_DIRECTORY)
+			{
+				pathType = ptFolder;
+			}
+			else {
+				pathType = ptFile;
+			}
+		}
+		else{
+            DWORD dwError = GetLastError();
+            if (ERROR_FILE_NOT_FOUND == dwError) {
+                pathType = ptNotExist;
+            }
+            else {
+                //TODO: 还有哪些错误
+                FTLASSERT(ERROR_ACCESS_DENIED == dwError);
+                
+                //ERROR_BAD_NETPATH
+            }
+        }
+
+		return pathType;
+	}
 	BOOL CFPath::CreateDirTree(LPCTSTR szPath)
 	{
 		TCHAR szDirName[MAX_PATH] = { 0 };

LogViewer/DialogSourceHistory.cpp

@@ -77,6 +77,12 @@ void CDialogSourceHistory::OnOK()
         m_listSourcePaths.GetText(index, strPath);
 
         if (nCheck > 0) {
+            //check folder path exist
+            if (ptFolder != FTL::CFPath::GetPathType(strPath)) {
+                FTL::FormatMessageBox(m_hWnd, TEXT("Wrong source path, please the path exist"), MB_OK | MB_ICONWARNING, TEXT("Path:%s"), strPath);
+                m_listSourcePaths.SetCurSel(index);
+                return;
+            }
             m_selectedPaths.Add(strPath);
         }
         if (isFirst)

LogViewer/LogItemView.cpp

@@ -32,6 +32,7 @@ static strColumnInfo	columnInfos[] =
     {TEXT("ModuleName"), 20,},
     {TEXT("FunName"), 20,},
     {TEXT("SourceFile"), 20,},
+    {TEXT("TraceInfoLen"), 20,},
     {TEXT("TraceInfo"), 800,}
 };
 
@@ -64,9 +65,9 @@ CLogItemView::~CLogItemView()
 
 BEGIN_MESSAGE_MAP(CLogItemView, CListView)
 	ON_COMMAND_EX(ID_EDIT_GOTO, &CLogItemView::OnEditGoTo)
-	ON_COMMAND_EX(ID_EDIT_CLEAR_CACHE, &CLogItemView::OnEditClearCache)
+    ON_COMMAND_EX(ID_EDIT_CLEAR_CACHE, &CLogItemView::OnEditClearCache)
     ON_COMMAND_EX(ID_EDIT_SET_SRC_PATHS, &CLogItemView::OnEditSetSrcPaths)
-	ON_NOTIFY(HDN_ITEMCLICK, 0, &CLogItemView::OnHdnItemclickListAllLogitems)
+    ON_NOTIFY(HDN_ITEMCLICK, 0, &CLogItemView::OnHdnItemclickListAllLogitems)
     //ON_NOTIFY_RANGE(LVN_COLUMNCLICK,0,0xffff,OnColumnClick)
     //ON_NOTIFY_REFLECT(LVN_GETDISPINFO, OnGetdispinfo)
     ON_NOTIFY_REFLECT(NM_CLICK, &CLogItemView::OnNMClick)
@@ -331,6 +332,10 @@ void CLogItemView::GetDispInfo(LVITEM* pItem)
         case type_TraceLevel:
             StringCchCopy(pItem->pszText,pItem->cchTextMax - 1,pszTraceLevel[pLogItem->level]);
             break;
+        case type_TraceInfoLen:
+            strFormat.Format(TEXT("%d"), pLogItem->traceInfoLen);
+            StringCchCopy(pItem->pszText, pItem->cchTextMax - 1, (LPCTSTR)strFormat);
+            break;
         case type_TraceInfo:
             if (NULL != pLogItem->pszTraceInfo){
                 StringCchCopy(pItem->pszText,pItem->cchTextMax - 1, (LPCTSTR)pLogItem->pszTraceInfo);
@@ -672,7 +677,7 @@ CString CLogItemView::_GetSelectedText(int textType)
                     break;
             }
 
-            if (NULL == strFormater.GetString())
+            if (0 == strFormater.GetStringLength())
             {
                 //first line
                 strFormater.AppendFormat(TEXT("%s"), strText);
@@ -814,51 +819,62 @@ void CLogItemView::_HighlightSameThread(LogItemPointer pCompareLogItem)
     }
 }
 
-int CLogItemView::_GetSelectedIdTypeValue(MachinePIdTIdType& idType) {
+int CLogItemView::_GetSelectedIdTypeValue(MachinePIdTIdTypeList& idTypeList) {
     CLogManager& logManager = GetDocument()->m_FTLogManager;
 
-    LVHITTESTINFO lvHistTestInfo = GetCurrentSelectInfo();
-    if (lvHistTestInfo.iItem != -1)
+    LogIndexContainer selectedItemList;
+    INT nSelectedSubItem = -1;
+    LONG nSelectCount = _GetSelectedLines(selectedItemList, nSelectedSubItem);
+    if (nSelectCount > 0 && nSelectedSubItem != -1)
     {
-        const LogItemPointer pLogItem = logManager.GetDisplayLogItem(lvHistTestInfo.iItem);
-        if (pLogItem) {
-            idType.machine = pLogItem->machine;
-            idType.pid = pLogItem->processId;
-            idType.tid = pLogItem->threadId;
+        for (LogIndexContainerIter iter = selectedItemList.begin(); iter != selectedItemList.end(); ++iter)
+        {
+            const LogItemPointer pLogItem = logManager.GetDisplayLogItem(*iter);
+            if(pLogItem){
+                MachinePIdTIdType idType;
+                idType.machine = pLogItem->machine;
+                idType.pid = pLogItem->processId;
+                idType.tid = pLogItem->threadId;
+                idTypeList.push_back(idType);
+                FTLTRACE(TEXT("Filter machine=%s, pid=%s, tid=%s"), 
+                    idType.machine.c_str(), idType.pid.c_str(), idType.tid.c_str());
+            }
         }
     }
-    return lvHistTestInfo.iItem;
+
+    return nSelectedSubItem;
 }
 
 void CLogItemView::OnDetailSelectCurrentPid() {
     int oldSelectIndex = 0;
-    MachinePIdTIdType selectedIdType;
+    MachinePIdTIdTypeList selectIdTypeList;
 
-    if(-1 != (oldSelectIndex = _GetSelectedIdTypeValue(selectedIdType))) {
+    if(-1 != (oldSelectIndex = _GetSelectedIdTypeValue(selectIdTypeList))) {
         CLogManager& logManager = GetDocument()->m_FTLogManager;
 
         UINT nCurSelectLine = _GetCurrentFirstSelectLine();
-        logManager.OnlySelectSpecialItems(selectedIdType, ONLY_SELECT_TYPE::ostProcessId);
-        GetDocument()->UpdateAllViews(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_PID, (CObject*)&selectedIdType);
-        OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_PID, (CObject*)&selectedIdType);
+        logManager.OnlySelectSpecialItems(selectIdTypeList, ONLY_SELECT_TYPE::ostProcessId);
+        GetDocument()->UpdateAllViews(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_PID, (CObject*)&selectIdTypeList);
+        OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_PID, (CObject*)&selectIdTypeList);
         _GotoSpecialLine(nCurSelectLine);
     }
 }
 
 void CLogItemView::OnDetailSelectCurrentTid() {
     int oldSelectIndex = 0;
-    MachinePIdTIdType selectedIdType;
-    if (-1 != (oldSelectIndex = _GetSelectedIdTypeValue(selectedIdType))) {
+    MachinePIdTIdTypeList selectIdTypeList;
+    if (-1 != (oldSelectIndex = _GetSelectedIdTypeValue(selectIdTypeList))) {
         CLogManager& logManager = GetDocument()->m_FTLogManager;
 
         UINT nCurSelectLine = _GetCurrentFirstSelectLine();
-        logManager.OnlySelectSpecialItems(selectedIdType, ONLY_SELECT_TYPE::ostThreadId);
-        GetDocument()->UpdateAllViews(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_TID, (CObject*)&selectedIdType);
-        OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_TID, (CObject*)&selectedIdType);
+        logManager.OnlySelectSpecialItems(selectIdTypeList, ONLY_SELECT_TYPE::ostThreadId);
+        GetDocument()->UpdateAllViews(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_TID, (CObject*)&selectIdTypeList);
+        OnUpdate(this, VIEW_UPDATE_HINT_FILTER_BY_CHOOSE_TID, (CObject*)&selectIdTypeList);
         _GotoSpecialLine(nCurSelectLine);
     }
 }
 
+
 BOOL CLogItemView::OnEraseBkgnd(CDC* pDC)
 {
 //减少闪烁

LogViewer/LogItemView.h

@@ -72,7 +72,7 @@ class CLogItemView : public CListView
     afx_msg void OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult);
     afx_msg void OnUpdateIndicatorSelectedLogItem(CCmdUI *pCmdUI);
 private:
-    int _GetSelectedIdTypeValue(MachinePIdTIdType& idType);
+    int _GetSelectedIdTypeValue(MachinePIdTIdTypeList& idTypeList);
     UINT _GetCurrentFirstSelectLine();
     BOOL _GotoSpecialLine(UINT nGotoLineNumber);
 };