Issue #1234 - Convert strings associated with URL's

src/plugin/PluginDebug.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginDebug.h"
 #include "PluginMutex.h"
 #include "PluginSettings.h"
 
 
 class CPluginDebugLock : public CPluginMutex
 {
 
@@ skipping 165 matching lines @@
 }
 
 void CPluginDebug::DebugResultDomain(const CString& domain)
 {
   DebugResult(L"===========================================================================================================================================================================================");
   DebugResult(domain);
   DebugResult(L"===========================================================================================================================================================================================");
 }
 
 
-void CPluginDebug::DebugResultBlocking(const CString& type, const CString& src, const std::wstring& domain)
+void CPluginDebug::DebugResultBlocking(const CString& type, const std::wstring& src, const std::wstring& domain)
 {
-  CString srcTrunc = src;
-  if (srcTrunc.GetLength() > 100)
+  CString srcTrunc = ToCString(src);

[sergei, 2014/10/17 10:10:12]

Despite it might be not a part of this change, I would refactor it to a separate
function now.
std::wstring shorten(const std::wstring& value)
{
  if (value.length() > 100)
  {
    return value.substr(0, 67) + L"..." + value.substr(src.length() - 30 - 1);
  }
  return value;
}

[Eric, 2014/10/20 02:36:01]

Out of scope for this review.

The whole debug logging system could use an overhaul. It's using CString::Format
instead of the standard library format functions. There's already a rewrite
scheduled as part of the process to convert away from CString.

+  if (src.length() > 100)
   {
-    srcTrunc = src.Left(67) + L"..." + src.Right(30);
+    srcTrunc = srcTrunc.Left(67) + L"..." + srcTrunc.Right(30);
   }
 
   CString blocking;
   blocking.Format(L"Blocked  %-12s  %-20s  %s", type, domain.empty()? L"-" : to_CString(domain), srcTrunc);
 
   DebugResult(blocking);
 }
 
 
-void CPluginDebug::DebugResultHiding(const CString& tag, const CString& src, const CString& filter)
+void CPluginDebug::DebugResultHiding(const CString& tag, const CString& id, const CString& filter)

[sergei, 2014/10/17 10:10:12]

Why is it renamed to id?

[Eric, 2014/10/20 02:36:01]

That's how it is declared in the header, which better reflects how it's used in
the code. It's only used for certain attributes (class names and element
identifiers) and not for URL's.

[sergei, 2014/10/21 09:45:17]

In CPluginDomTraverser::HideElement we pass url, but nevertheless 'id' looks
reasonable here.

 {
-  CString srcTrunc = src;
+  CString srcTrunc = id;
   if (srcTrunc.GetLength() > 100)
   {
-    srcTrunc = src.Left(67) + L"..." + src.Right(30);
+    srcTrunc = srcTrunc.Left(67) + L"..." + srcTrunc.Right(30);
   }
 
   CString blocking;
   blocking.Format(L"Hidden   %-12s  - %s  %s", tag, srcTrunc, filter);
 
   DebugResult(blocking);
 }
 
 
 void CPluginDebug::DebugResultClear()
 {
   CPluginDebugLock lock;
   if (lock.IsLocked())
   {
     DeleteFileW(GetDataPath(L"debug_result.txt").c_str());
   }
 }
 
 #endif // ENABLE_DEBUG_RESULT
 
 
 #ifdef ENABLE_DEBUG_RESULT_IGNORED
 
-void CPluginDebug::DebugResultIgnoring(const CString& type, const CString& src, const std::wstring& domain)
+void CPluginDebug::DebugResultIgnoring(const CString& type, const std::wstring& src, const std::wstring& domain)
 {
-  CString srcTrunc = src;
-  if (srcTrunc.GetLength() > 100)
+  CString srcTrunc = ToCString(src);
+  if (src.length() > 100)
   {
-    srcTrunc = src.Left(67) + L"..." + src.Right(30);
+    srcTrunc = srcTrunc.Left(67) + L"..." + srcTrunc.Right(30);
   }
 
   CString blocking;
   blocking.Format(L"Ignored  %-12s  %s  %s", type, domain.empty()? L"-" : to_CString(domain), srcTrunc);
 
   DebugResult(blocking);
 }
 
 #endif // ENABLE_DEBUG_RESULT_IGNORED