react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/HashCon.cpp

@@ -4,8 +4,6 @@
 
 #include "../../../Common/IntToString.h"
 
-#include "../../../Windows/FileName.h"
-
 #include "ConsoleClose.h"
 #include "HashCon.h"
 
@@ -35,15 +33,13 @@ HRESULT CHashCallbackConsole::StartScanning()
   return CheckBreak2();
 }
 
-HRESULT CHashCallbackConsole::ScanProgress(const CDirItemsStat &st, const FString &path, bool isDir)
+HRESULT CHashCallbackConsole::ScanProgress(const CDirItemsStat &st, const FString &path, bool /* isDir */)
 {
   if (NeedPercents())
   {
     _percent.Files = st.NumDirs + st.NumFiles + st.NumAltStreams;
     _percent.Completed = st.GetTotalBytes();
     _percent.FileName = fs2us(path);
-    if (isDir)
-      NWindows::NFile::NName::NormalizeDirPathPrefix(_percent.FileName);
     _percent.Print();
   }
   return CheckBreak2();
@@ -99,7 +95,7 @@ HRESULT CHashCallbackConsole::SetCompleted(const UInt64 *completeValue)
 static void AddMinuses(AString &s, unsigned num)
 {
   for (unsigned i = 0; i < num; i++)
-    s.Add_Minus();
+    s += '-';
 }
 
 static void AddSpaces_if_Positive(AString &s, int num)
@@ -115,15 +111,6 @@ static void SetSpacesAndNul(char *s, unsigned num)
   s[num] = 0;
 }
 
-static void SetSpacesAndNul_if_Positive(char *s, int num)
-{
-  if (num < 0)
-    return;
-  for (int i = 0; i < num; i++)
-    s[i] = ' ';
-  s[num] = 0;
-}
-
 static const unsigned kSizeField_Len = 13;
 static const unsigned kNameField_Len = 12;
 
@@ -135,83 +122,61 @@ static unsigned GetColumnWidth(unsigned digestSize)
   return width < kHashColumnWidth_Min ? kHashColumnWidth_Min: width;
 }
 
-
-AString CHashCallbackConsole::GetFields() const
-{
-  AString s (PrintFields);
-  if (s.IsEmpty())
-    s = "hsn";
-  s.MakeLower_Ascii();
-  return s;
-}
-
-
 void CHashCallbackConsole::PrintSeparatorLine(const CObjectVector<CHasherState> &hashers)
 {
   _s.Empty();
-  const AString fields = GetFields();
-  for (unsigned pos = 0; pos < fields.Len(); pos++)
+  
+  for (unsigned i = 0; i < hashers.Size(); i++)
   {
-    const char c = fields[pos];
-    if (c == 'h')
-    {
-      for (unsigned i = 0; i < hashers.Size(); i++)
-      {
-        AddSpace();
-        const CHasherState &h = hashers[i];
-        AddMinuses(_s, GetColumnWidth(h.DigestSize));
-      }
-    }
-    else if (c == 's')
-    {
-      AddSpace();
-      AddMinuses(_s, kSizeField_Len);
-    }
-    else if (c == 'n')
-    {
-      AddSpacesBeforeName();
-      AddMinuses(_s, kNameField_Len);
-    }
+    if (i != 0)
+      _s.Add_Space();
+    const CHasherState &h = hashers[i];
+    AddMinuses(_s, GetColumnWidth(h.DigestSize));
+  }
+
+  if (PrintSize)
+  {
+    _s.Add_Space();
+    AddMinuses(_s, kSizeField_Len);
+  }
+
+  if (PrintName)
+  {
+    AddSpacesBeforeName();
+    AddMinuses(_s, kNameField_Len);
   }
   
   *_so << _s << endl;
 }
 
-
 HRESULT CHashCallbackConsole::BeforeFirstFile(const CHashBundle &hb)
 {
   if (PrintHeaders && _so)
   {
     _s.Empty();
     ClosePercents_for_so();
-
-    const AString fields = GetFields();
-    for (unsigned pos = 0; pos < fields.Len(); pos++)
+    
+    FOR_VECTOR (i, hb.Hashers)
     {
-      const char c = fields[pos];
-      if (c == 'h')
-      {
-        FOR_VECTOR (i, hb.Hashers)
-        {
-          AddSpace();
-          const CHasherState &h = hb.Hashers[i];
-          _s += h.Name;
-          AddSpaces_if_Positive(_s, (int)GetColumnWidth(h.DigestSize) - (int)h.Name.Len());
-        }
-      }
-      
-      else if (c == 's')
-      {
-        AddSpace();
-        const AString s2 ("Size");
-        AddSpaces_if_Positive(_s, (int)kSizeField_Len - (int)s2.Len());
-        _s += s2;
-      }
-      else if (c == 'n')
-      {
-        AddSpacesBeforeName();
-        _s += "Name";
-      }
+      if (i != 0)
+        _s.Add_Space();
+      const CHasherState &h = hb.Hashers[i];
+      _s += h.Name;
+      AddSpaces_if_Positive(_s, (int)GetColumnWidth(h.DigestSize) - (int)h.Name.Len());
+    }
+    
+    if (PrintSize)
+    {
+      _s.Add_Space();
+      const AString s2 ("Size");
+      AddSpaces_if_Positive(_s, (int)kSizeField_Len - (int)s2.Len());
+      _s += s2;
+    }
+    
+    if (PrintName)
+    {
+      AddSpacesBeforeName();
+      _s += "Name";
     }
     
     *_so << _s << endl;
@@ -226,11 +191,9 @@ HRESULT CHashCallbackConsole::OpenFileError(const FString &path, DWORD systemErr
   return OpenFileError_Base(path, systemError);
 }
 
-HRESULT CHashCallbackConsole::GetStream(const wchar_t *name, bool isDir)
+HRESULT CHashCallbackConsole::GetStream(const wchar_t *name, bool /* isFolder */)
 {
   _fileName = name;
-  if (isDir)
-    NWindows::NFile::NName::NormalizeDirPathPrefix(_fileName);
 
   if (NeedPercents())
   {
@@ -245,81 +208,61 @@ HRESULT CHashCallbackConsole::GetStream(const wchar_t *name, bool isDir)
   return CheckBreak2();
 }
 
-
-static const unsigned k_DigestStringSize = k_HashCalc_DigestSize_Max * 2 + k_HashCalc_ExtraSize * 2 + 16;
-
-
-
 void CHashCallbackConsole::PrintResultLine(UInt64 fileSize,
-    const CObjectVector<CHasherState> &hashers, unsigned digestIndex, bool showHash,
-    const AString &path)
+    const CObjectVector<CHasherState> &hashers, unsigned digestIndex, bool showHash)
 {
   ClosePercents_for_so();
 
   _s.Empty();
-  const AString fields = GetFields();
+
+  FOR_VECTOR (i, hashers)
+  {
+    const CHasherState &h = hashers[i];
+    char s[k_HashCalc_DigestSize_Max * 2 + 64];
+    s[0] = 0;
+    if (showHash)
+      AddHashHexToString(s, h.Digests[digestIndex], h.DigestSize);
+    SetSpacesAndNul(s + strlen(s), (int)GetColumnWidth(h.DigestSize) - (int)strlen(s));
+    if (i != 0)
+      _s.Add_Space();
+    _s += s;
+  }
   
-  for (unsigned pos = 0; pos < fields.Len(); pos++)
+  if (PrintSize)
   {
-    const char c = fields[pos];
-    if (c == 'h')
+    _s.Add_Space();
+
+    char s[kSizeField_Len + 32];
+    char *p = s;
+    
+    if (showHash)
     {
-      FOR_VECTOR (i, hashers)
+      p = s + kSizeField_Len;
+      ConvertUInt64ToString(fileSize, p);
+      int numSpaces = kSizeField_Len - (int)strlen(p);
+      if (numSpaces > 0)
       {
-        AddSpace();
-        const CHasherState &h = hashers[i];
-        char s[k_DigestStringSize];
-        s[0] = 0;
-        if (showHash)
-          h.WriteToString(digestIndex, s);
-        const unsigned len = (unsigned)strlen(s);
-        SetSpacesAndNul_if_Positive(s + len, (int)GetColumnWidth(h.DigestSize) - (int)len);
-        _s += s;
+        p -= (unsigned)numSpaces;
+        for (unsigned i = 0; i < (unsigned)numSpaces; i++)
+          p[i] = ' ';
       }
     }
-    else if (c == 's')
-    {
-      AddSpace();
-      char s[kSizeField_Len + 32];
-      char *p = s;
+    else
       SetSpacesAndNul(s, kSizeField_Len);
-      if (showHash)
-      {
-        p = s + kSizeField_Len;
-        ConvertUInt64ToString(fileSize, p);
-        const int numSpaces = (int)kSizeField_Len - (int)strlen(p);
-        if (numSpaces > 0)
-          p -= (unsigned)numSpaces;
-      }
-      _s += p;
-    }
-    else if (c == 'n')
-    {
-      AddSpacesBeforeName();
-      _s += path;
-    }
+    
+    _s += p;
   }
+
+  if (PrintName)
+    AddSpacesBeforeName();
   
   *_so << _s;
 }
 
-
 HRESULT CHashCallbackConsole::SetOperationResult(UInt64 fileSize, const CHashBundle &hb, bool showHash)
 {
   if (_so)
   {
-    AString s;
-    if (_fileName.IsEmpty())
-      s = kEmptyFileAlias;
-    else
-    {
-      UString temp (_fileName);
-      _so->Normalize_UString_Path(temp);
-      _so->Convert_UString_to_AString(temp, s);
-    }
-    PrintResultLine(fileSize, hb.Hashers, k_HashCalc_Index_Current, showHash, s);
-
-    /*
     PrintResultLine(fileSize, hb.Hashers, k_HashCalc_Index_Current, showHash);
     if (PrintName)
     {
@@ -328,9 +271,7 @@ HRESULT CHashCallbackConsole::SetOperationResult(UInt64 fileSize, const CHashBun
       else
         _so->NormalizePrint_UString(_fileName);
     }
-    */
-    // if (PrintNewLine)
-      *_so << endl;
+    *_so << endl;
   }
   
   if (NeedPercents())
@@ -362,9 +303,9 @@ static void PrintSum(CStdOutStream &so, const CHasherState &h, unsigned digestIn
 
   so << k_DigestTitles[digestIndex];
 
-  char s[k_DigestStringSize];
-  // s[0] = 0;
-  h.WriteToString(digestIndex, s);
+  char s[k_HashCalc_DigestSize_Max * 2 + 64];
+  s[0] = 0;
+  AddHashHexToString(s, h.Digests[digestIndex], h.DigestSize);
   so << s << endl;
 }
 
@@ -399,7 +340,7 @@ HRESULT CHashCallbackConsole::AfterLastFile(CHashBundle &hb)
   {
     PrintSeparatorLine(hb.Hashers);
     
-    PrintResultLine(hb.FilesSize, hb.Hashers, k_HashCalc_Index_DataSum, true, AString());
+    PrintResultLine(hb.FilesSize, hb.Hashers, k_HashCalc_Index_DataSum, true);
     
     *_so << endl << endl;
     

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/HashCon.h

@@ -1,56 +1,46 @@
 // HashCon.h
 
-#ifndef ZIP7_INC_HASH_CON_H
-#define ZIP7_INC_HASH_CON_H
+#ifndef __HASH_CON_H
+#define __HASH_CON_H
 
 #include "../Common/HashCalc.h"
 
 #include "UpdateCallbackConsole.h"
 
-class CHashCallbackConsole Z7_final:
-    public IHashCallbackUI,
-    public CCallbackConsoleBase
+class CHashCallbackConsole: public IHashCallbackUI, public CCallbackConsoleBase
 {
-  Z7_IFACE_IMP(IDirItemsCallback)
-  Z7_IFACE_IMP(IHashCallbackUI)
-
   UString _fileName;
   AString _s;
 
-  void AddSpace()
-  {
-    _s.Add_Space_if_NotEmpty();
-  }
-
   void AddSpacesBeforeName()
   {
-    if (!_s.IsEmpty())
-    {
-      _s.Add_Space();
-      _s.Add_Space();
-    }
+    _s.Add_Space();
+    _s.Add_Space();
   }
 
   void PrintSeparatorLine(const CObjectVector<CHasherState> &hashers);
   void PrintResultLine(UInt64 fileSize,
-      const CObjectVector<CHasherState> &hashers, unsigned digestIndex, bool showHash, const AString &path);
+      const CObjectVector<CHasherState> &hashers, unsigned digestIndex, bool showHash);
   void PrintProperty(const char *name, UInt64 value);
 
 public:
   bool PrintNameInPercents;
-  bool PrintHeaders;
-  // bool PrintSize;
-  // bool PrintNewLine; // set it too (false), if you need only hash for single file without LF char.
-  AString PrintFields;
 
-  AString GetFields() const;
+  bool PrintHeaders;
+  
+  bool PrintSize;
+  bool PrintName;
 
   CHashCallbackConsole():
       PrintNameInPercents(true),
-      PrintHeaders(false)
-      // , PrintSize(true),
-      // , PrintNewLine(true)
+      PrintHeaders(false),
+      PrintSize(true),
+      PrintName(true)
     {}
+  
+  ~CHashCallbackConsole() { }
+
+  INTERFACE_IHashCallbackUI(;)
 };
 
 void PrintHashStat(CStdOutStream &so, const CHashBundle &hb);