react-native-update 10.34.3 → 10.34.4

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

@@ -5,21 +5,18 @@
 #include "../../../Common/IntToString.h"
 
 #include "../../../Windows/ErrorMsg.h"
-#include "../../../Windows/FileName.h"
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 #include "../../../Windows/Synchronization.h"
 #endif
 
-// #include "../Common/PropIDUtils.h"
-
 #include "ConsoleClose.h"
 #include "UserInputUtils.h"
 #include "UpdateCallbackConsole.h"
 
 using namespace NWindows;
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 static NSynchronization::CCriticalSection g_CriticalSection;
 #define MT_LOCK NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
 #else
@@ -136,7 +133,7 @@ HRESULT CUpdateCallbackConsole::OpenResult(
   {
     if (_so)
     {
-      RINOK(Print_OpenArchive_Props(*_so, codecs, arcLink))
+      RINOK(Print_OpenArchive_Props(*_so, codecs, arcLink));
       *_so << endl;
     }
   }
@@ -147,10 +144,10 @@ HRESULT CUpdateCallbackConsole::OpenResult(
     if (_se)
     {
       *_se << kError;
-      _se->NormalizePrint_wstr_Path(name);
+      _se->NormalizePrint_wstr(name);
       *_se << endl;
       HRESULT res = Print_OpenArchive_Error(*_se, codecs, arcLink);
-      RINOK(res)
+      RINOK(res);
       _se->Flush();
     }
   }
@@ -191,28 +188,12 @@ void CCallbackConsoleBase::CommonError(const FString &path, DWORD systemError, b
     *_se << endl << (isWarning ? kWarning : kError)
         << NError::MyFormatMessage(systemError)
         << endl;
-    _se->NormalizePrint_UString_Path(fs2us(path));
+    _se->NormalizePrint_UString(fs2us(path));
     *_se << endl << endl;
     _se->Flush();
   }
 }
 
-/*
-void CCallbackConsoleBase::CommonError(const char *message)
-{
-  ClosePercents2();
-  
-  if (_se)
-  {
-    if (_so)
-      _so->Flush();
-
-    *_se << endl << kError << message << endl;
-    _se->Flush();
-  }
-}
-*/
-
 
 HRESULT CCallbackConsoleBase::ScanError_Base(const FString &path, DWORD systemError)
 {
@@ -228,7 +209,6 @@ HRESULT CCallbackConsoleBase::OpenFileError_Base(const FString &path, DWORD syst
 {
   MT_LOCK
   FailedFiles.AddError(path, systemError);
-  NumNonOpenFiles++;
   /*
   if (systemError == ERROR_SHARING_VIOLATION)
   {
@@ -302,17 +282,11 @@ HRESULT CUpdateCallbackConsole::StartOpenArchive(const wchar_t *name)
 
 HRESULT CUpdateCallbackConsole::StartArchive(const wchar_t *name, bool updating)
 {
-  if (NeedPercents())
-    _percent.ClosePrint(true);
-  
-  _percent.ClearCurState();
-  NumNonOpenFiles = 0;
-
   if (_so)
   {
     *_so << (updating ? kUpdatingArchiveMessage : kCreatingArchiveMessage);
     if (name)
-      _so->NormalizePrint_wstr_Path(name);
+      _so->NormalizePrint_wstr(name);
     else
       *_so << k_StdOut_ArcName;
    *_so << endl << endl;
@@ -328,17 +302,11 @@ HRESULT CUpdateCallbackConsole::FinishArchive(const CFinishArchiveStat &st)
   {
     AString s;
     // Print_UInt64_and_String(s, _percent.Files == 1 ? "file" : "files", _percent.Files);
-    PrintPropPair(s, "Files read from disk", _percent.Files - NumNonOpenFiles);
+    PrintPropPair(s, "Files read from disk", _percent.Files);
     s.Add_LF();
     s += "Archive size: ";
     PrintSize_bytes_Smart(s, st.OutArcFileSize);
     s.Add_LF();
-    if (st.IsMultiVolMode)
-    {
-      s += "Volumes: ";
-      s.Add_UInt32(st.NumVolumes);
-      s.Add_LF();
-    }
     *_so << endl;
     *_so << s;
     // *_so << endl;
@@ -361,119 +329,6 @@ HRESULT CUpdateCallbackConsole::WriteSfx(const wchar_t *name, UInt64 size)
 }
 
 
-
-HRESULT CUpdateCallbackConsole::MoveArc_UpdateStatus()
-{
-  if (NeedPercents())
-  {
-    AString &s = _percent.Command;
-    s = " : ";
-    s.Add_UInt64(_arcMoving_percents);
-    s.Add_Char('%');
-    const bool totalDefined = (_arcMoving_total != 0 && _arcMoving_total != (UInt64)(Int64)-1);
-    if (_arcMoving_current != 0 || totalDefined)
-    {
-      s += " : ";
-      s.Add_UInt64(_arcMoving_current >> 20);
-      s += " MiB";
-    }
-    if (totalDefined)
-    {
-      s += " / ";
-      s.Add_UInt64((_arcMoving_total + ((1 << 20) - 1)) >> 20);
-      s += " MiB";
-    }
-    s += " : temporary archive moving ...";
-    _percent.Print();
-  }
-
-  // we ignore single Ctrl-C, if (_arcMoving_updateMode) mode
-  // because we want to get good final archive instead of temp archive.
-  if (NConsoleClose::g_BreakCounter == 1 && _arcMoving_updateMode)
-    return S_OK;
-  return CheckBreak();
-}
-
-
-HRESULT CUpdateCallbackConsole::MoveArc_Start(
-    const wchar_t *srcTempPath, const wchar_t *destFinalPath,
-    UInt64 size, Int32 updateMode)
-{
-#if 0 // 1 : for debug
-  if (LogLevel > 0 && _so)
-  {
-    ClosePercents_for_so();
-    *_so << "Temporary archive moving:" << endl;
-    _tempU = srcTempPath;
-    _so->Normalize_UString_Path(_tempU);
-    _so->PrintUString(_tempU, _tempA);
-    *_so << endl;
-    _tempU = destFinalPath;
-    _so->Normalize_UString_Path(_tempU);
-    _so->PrintUString(_tempU, _tempA);
-    *_so << endl;
-  }
-#else
-  UNUSED_VAR(srcTempPath)
-  UNUSED_VAR(destFinalPath)
-#endif
-
-  _arcMoving_updateMode = updateMode;
-  _arcMoving_total = size;
-  _arcMoving_current = 0;
-  _arcMoving_percents = 0;
-  return MoveArc_UpdateStatus();
-}
-
-
-HRESULT CUpdateCallbackConsole::MoveArc_Progress(UInt64 totalSize, UInt64 currentSize)
-{
-#if 0 // 1 : for debug
-  if (_so)
-  {
-    ClosePercents_for_so();
-    *_so << totalSize << " : " << currentSize << endl;
-  }
-#endif
-
-  UInt64 percents = 0;
-  if (totalSize != 0)
-  {
-    if (totalSize < ((UInt64)1 << 57))
-      percents = currentSize * 100 / totalSize;
-    else
-      percents = currentSize / (totalSize / 100);
-  }
-
-#ifdef _WIN32
-  // Sleep(300); // for debug
-#endif
-  // totalSize = (UInt64)(Int64)-1; // for debug
-
-  if (percents == _arcMoving_percents)
-    return CheckBreak();
-  _arcMoving_current = currentSize;
-  _arcMoving_total = totalSize;
-  _arcMoving_percents = percents;
-  return MoveArc_UpdateStatus();
-}
-
-
-HRESULT CUpdateCallbackConsole::MoveArc_Finish()
-{
-  // _arcMoving_percents = 0;
-  if (NeedPercents())
-  {
-    _percent.Command.Empty();
-    _percent.Print();
-  }
-  // it can return delayed user break (E_ABORT) status,
-  // if it ignored single CTRL+C in MoveArc_Progress().
-  return CheckBreak();
-}
-
-
-
 HRESULT CUpdateCallbackConsole::DeletingAfterArchiving(const FString &path, bool /* isDir */)
 {
   if (LogLevel > 0 && _so)
@@ -492,7 +347,7 @@ HRESULT CUpdateCallbackConsole::DeletingAfterArchiving(const FString &path, bool
         _tempA.Add_Space();
         *_so << _tempA;
         _tempU = fs2us(path);
-        _so->Normalize_UString_Path(_tempU);
+        _so->Normalize_UString(_tempU);
         _so->PrintUString(_tempU, _tempA);
         *_so << endl;
         if (NeedFlush)
@@ -608,7 +463,7 @@ HRESULT CUpdateCallbackConsole::SetRatioInfo(const UInt64 * /* inSize */, const
   return CheckBreak2();
 }
 
-HRESULT CCallbackConsoleBase::PrintProgress(const wchar_t *name, bool isDir, const char *command, bool showInLog)
+HRESULT CCallbackConsoleBase::PrintProgress(const wchar_t *name, const char *command, bool showInLog)
 {
   MT_LOCK
   
@@ -627,9 +482,7 @@ HRESULT CCallbackConsoleBase::PrintProgress(const wchar_t *name, bool isDir, con
     if (name)
     {
       _tempU = name;
-      if (isDir)
-        NWindows::NFile::NName::NormalizeDirPathPrefix(_tempU);
-      _so->Normalize_UString_Path(_tempU);
+      _so->Normalize_UString(_tempU);
     }
     _so->PrintUString(_tempU, _tempA);
     *_so << endl;
@@ -656,29 +509,7 @@ HRESULT CCallbackConsoleBase::PrintProgress(const wchar_t *name, bool isDir, con
   return CheckBreak2();
 }
 
-
-/*
-void CCallbackConsoleBase::PrintInfoLine(const UString &s)
-{
-  if (LogLevel < 1000)
-    return;
-
-  MT_LOCK
-
-  const bool show2 = (_so != NULL);
-
-  if (show2)
-  {
-    ClosePercents_for_so();
-    _so->PrintUString(s, _tempA);
-    *_so << endl;
-    if (NeedFlush)
-      _so->Flush();
-  }
-}
-*/
-
-HRESULT CUpdateCallbackConsole::GetStream(const wchar_t *name, bool isDir, bool isAnti, UInt32 mode)
+HRESULT CUpdateCallbackConsole::GetStream(const wchar_t *name, bool /* isDir */, bool isAnti, UInt32 mode)
 {
   if (StdOutMode)
     return S_OK;
@@ -708,7 +539,7 @@ HRESULT CUpdateCallbackConsole::GetStream(const wchar_t *name, bool isDir, bool
       s = "Reading";
   }
   
-  return PrintProgress(name, isDir, s, LogLevel >= requiredLevel);
+  return PrintProgress(name, s, LogLevel >= requiredLevel);
 }
 
 HRESULT CUpdateCallbackConsole::OpenFileError(const FString &path, DWORD systemError)
@@ -721,19 +552,10 @@ HRESULT CUpdateCallbackConsole::ReadingFileError(const FString &path, DWORD syst
   return ReadingFileError_Base(path, systemError);
 }
 
-HRESULT CUpdateCallbackConsole::SetOperationResult(Int32 /* opRes */)
+HRESULT CUpdateCallbackConsole::SetOperationResult(Int32)
 {
   MT_LOCK
   _percent.Files++;
-  /*
-  if (opRes != NArchive::NUpdate::NOperationResult::kOK)
-  {
-    if (opRes == NArchive::NUpdate::NOperationResult::kError_FileChanged)
-    {
-      CommonError("Input file changed");
-    }
-  }
-  */
   return S_OK;
 }
 
@@ -755,7 +577,7 @@ HRESULT CUpdateCallbackConsole::ReportExtractResult(Int32 opRes, Int32 isEncrypt
       AString s;
       SetExtractErrorMessage(opRes, isEncrypted, s);
       *_se << s << " : " << endl;
-      _se->NormalizePrint_wstr_Path(name);
+      _se->NormalizePrint_wstr(name);
       *_se << endl << endl;
       _se->Flush();
     }
@@ -765,7 +587,7 @@ HRESULT CUpdateCallbackConsole::ReportExtractResult(Int32 opRes, Int32 isEncrypt
 }
 
 
-HRESULT CUpdateCallbackConsole::ReportUpdateOperation(UInt32 op, const wchar_t *name, bool isDir)
+HRESULT CUpdateCallbackConsole::ReportUpdateOpeartion(UInt32 op, const wchar_t *name, bool /* isDir */)
 {
   // if (StdOutMode) return S_OK;
 
@@ -784,8 +606,6 @@ HRESULT CUpdateCallbackConsole::ReportUpdateOperation(UInt32 op, const wchar_t *
     case NUpdateNotifyOp::kSkip:      s = "."; requiredLevel = 2; break;
     case NUpdateNotifyOp::kDelete:    s = "D"; requiredLevel = 3; break;
     case NUpdateNotifyOp::kHeader:    s = "Header creation"; requiredLevel = 100; break;
-    case NUpdateNotifyOp::kInFileChanged: s = "Size of input file was changed:"; requiredLevel = 10; break;
-    // case NUpdateNotifyOp::kOpFinished:  s = "Finished"; requiredLevel = 100; break;
     default:
     {
       temp[0] = 'o';
@@ -795,17 +615,17 @@ HRESULT CUpdateCallbackConsole::ReportUpdateOperation(UInt32 op, const wchar_t *
     }
   }
 
-  return PrintProgress(name, isDir, s, LogLevel >= requiredLevel);
+  return PrintProgress(name, s, LogLevel >= requiredLevel);
 }
 
 /*
 HRESULT CUpdateCallbackConsole::SetPassword(const UString &
-    #ifndef Z7_NO_CRYPTO
+    #ifndef _NO_CRYPTO
     password
     #endif
     )
 {
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   PasswordIsDefined = true;
   Password = password;
   #endif
@@ -819,7 +639,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
 
   *password = NULL;
 
-  #ifdef Z7_NO_CRYPTO
+  #ifdef _NO_CRYPTO
 
   *passwordIsDefined = false;
   return S_OK;
@@ -830,7 +650,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
   {
     if (AskPassword)
     {
-      RINOK(GetPassword_HRESULT(_so, Password))
+      RINOK(GetPassword_HRESULT(_so, Password));
       PasswordIsDefined = true;
     }
   }
@@ -848,7 +668,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword(BSTR *password)
   
   *password = NULL;
 
-  #ifdef Z7_NO_CRYPTO
+  #ifdef _NO_CRYPTO
 
   return E_NOTIMPL;
   
@@ -867,7 +687,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword(BSTR *password)
   COM_TRY_END
 }
 
-HRESULT CUpdateCallbackConsole::ShowDeleteFile(const wchar_t *name, bool isDir)
+HRESULT CUpdateCallbackConsole::ShowDeleteFile(const wchar_t *name, bool /* isDir */)
 {
   if (StdOutMode)
     return S_OK;
@@ -876,123 +696,7 @@ HRESULT CUpdateCallbackConsole::ShowDeleteFile(const wchar_t *name, bool isDir)
   {
     if (!name || name[0] == 0)
       name = kEmptyFileAlias;
-    return PrintProgress(name, isDir, "D", true);
-  }
-  return S_OK;
-}
-
-/*
-void GetPropName(PROPID propID, const wchar_t *name, AString &nameA, UString &nameU);
-
-static void GetPropName(PROPID propID, UString &nameU)
-{
-  AString nameA;
-  GetPropName(propID, NULL, nameA, nameU);
-  // if (!nameA.IsEmpty())
-    nameU = nameA;
-}
-
-
-static void AddPropNamePrefix(UString &s, PROPID propID)
-{
-  UString name;
-  GetPropName(propID, name);
-  s += name;
-  s += " = ";
-}
-
-void CCallbackConsoleBase::PrintPropInfo(UString &s, PROPID propID, const PROPVARIANT *value)
-{
-  AddPropNamePrefix(s, propID);
-  {
-    UString dest;
-    const int level = 9; // we show up to ns precision level
-    ConvertPropertyToString2(dest, *value, propID, level);
-    s += dest;
-  }
-  PrintInfoLine(s);
-}
-
-static void Add_IndexType_Index(UString &s, UInt32 indexType, UInt32 index)
-{
-  if (indexType == NArchive::NEventIndexType::kArcProp)
-  {
-  }
-  else
-  {
-    if (indexType == NArchive::NEventIndexType::kBlockIndex)
-    {
-      s += "#";
-    }
-    else if (indexType == NArchive::NEventIndexType::kOutArcIndex)
-    {
-    }
-    else
-    {
-      s += "indexType_";
-      s.Add_UInt32(indexType);
-      s.Add_Space();
-    }
-    s.Add_UInt32(index);
-  }
-  s += ": ";
-}
-
-HRESULT CUpdateCallbackConsole::ReportProp(UInt32 indexType, UInt32 index, PROPID propID, const PROPVARIANT *value)
-{
-  UString s;
-  Add_IndexType_Index(s, indexType, index);
-  PrintPropInfo(s, propID, value);
-  return S_OK;
-}
-
-static inline char GetHex(Byte value)
-{
-  return (char)((value < 10) ? ('0' + value) : ('a' + (value - 10)));
-}
-
-static void AddHexToString(UString &dest, const Byte *data, UInt32 size)
-{
-  for (UInt32 i = 0; i < size; i++)
-  {
-    Byte b = data[i];
-    dest += GetHex((Byte)((b >> 4) & 0xF));
-    dest += GetHex((Byte)(b & 0xF));
-  }
-}
-
-void HashHexToString(char *dest, const Byte *data, UInt32 size);
-
-HRESULT CUpdateCallbackConsole::ReportRawProp(UInt32 indexType, UInt32 index,
-    PROPID propID, const void *data, UInt32 dataSize, UInt32 propType)
-{
-  UString s;
-  propType = propType;
-  Add_IndexType_Index(s, indexType, index);
-  AddPropNamePrefix(s, propID);
-  if (propID == kpidChecksum)
-  {
-    char temp[k_HashCalc_DigestSize_Max + 8];
-    HashHexToString(temp, (const Byte *)data, dataSize);
-    s += temp;
-  }
-  else
-    AddHexToString(s, (const Byte *)data, dataSize);
-  PrintInfoLine(s);
-  return S_OK;
-}
-
-HRESULT CUpdateCallbackConsole::ReportFinished(UInt32 indexType, UInt32 index, Int32 opRes)
-{
-  UString s;
-  Add_IndexType_Index(s, indexType, index);
-  s += "finished";
-  if (opRes != NArchive::NUpdate::NOperationResult::kOK)
-  {
-    s += ": ";
-    s.Add_UInt32(opRes);
+    return PrintProgress(name, "D", true);
   }
-  PrintInfoLine(s);
   return S_OK;
 }
-*/

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

@@ -1,7 +1,7 @@
 // UpdateCallbackConsole.h
 
-#ifndef ZIP7_INC_UPDATE_CALLBACK_CONSOLE_H
-#define ZIP7_INC_UPDATE_CALLBACK_CONSOLE_H
+#ifndef __UPDATE_CALLBACK_CONSOLE_H
+#define __UPDATE_CALLBACK_CONSOLE_H
 
 #include "../../../Common/StdOutStream.h"
 
@@ -26,58 +26,48 @@ struct CErrorPathCodes
   }
 };
 
-
 class CCallbackConsoleBase
 {
-  void CommonError(const FString &path, DWORD systemError, bool isWarning);
-
 protected:
+  CPercentPrinter _percent;
+
   CStdOutStream *_so;
   CStdOutStream *_se;
 
+  void CommonError(const FString &path, DWORD systemError, bool isWarning);
+  
   HRESULT ScanError_Base(const FString &path, DWORD systemError);
   HRESULT OpenFileError_Base(const FString &name, DWORD systemError);
   HRESULT ReadingFileError_Base(const FString &name, DWORD systemError);
 
 public:
+  bool NeedPercents() const { return _percent._so != NULL; };
+
   bool StdOutMode;
+
   bool NeedFlush;
   unsigned PercentsNameLevel;
   unsigned LogLevel;
 
-protected:
   AString _tempA;
   UString _tempU;
-  CPercentPrinter _percent;
-
-public:
-  CErrorPathCodes FailedFiles;
-  CErrorPathCodes ScanErrors;
-  UInt64 NumNonOpenFiles;
 
   CCallbackConsoleBase():
       StdOutMode(false),
       NeedFlush(false),
       PercentsNameLevel(1),
-      LogLevel(0),
-      NumNonOpenFiles(0)
+      LogLevel(0)
       {}
   
-  bool NeedPercents() const { return _percent._so != NULL; }
   void SetWindowWidth(unsigned width) { _percent.MaxLen = width - 1; }
 
-  void Init(
-      CStdOutStream *outStream,
-      CStdOutStream *errorStream,
-      CStdOutStream *percentStream,
-      bool disablePercents)
+  void Init(CStdOutStream *outStream, CStdOutStream *errorStream, CStdOutStream *percentStream)
   {
     FailedFiles.Clear();
 
     _so = outStream;
     _se = errorStream;
     _percent._so = percentStream;
-    _percent.DisablePrint = disablePercents;
   }
 
   void ClosePercents2()
@@ -92,50 +82,35 @@ public:
       _percent.ClosePrint(false);
   }
 
-  HRESULT PrintProgress(const wchar_t *name, bool isDir, const char *command, bool showInLog);
 
-  // void PrintInfoLine(const UString &s);
-  // void PrintPropInfo(UString &s, PROPID propID, const PROPVARIANT *value);
-};
+  CErrorPathCodes FailedFiles;
+  CErrorPathCodes ScanErrors;
+
+  HRESULT PrintProgress(const wchar_t *name, const char *command, bool showInLog);
 
+};
 
-class CUpdateCallbackConsole Z7_final:
-  public IUpdateCallbackUI2,
-  public CCallbackConsoleBase
+class CUpdateCallbackConsole: public IUpdateCallbackUI2, public CCallbackConsoleBase
 {
   // void PrintPropPair(const char *name, const wchar_t *val);
-  Z7_IFACE_IMP(IUpdateCallbackUI)
-  Z7_IFACE_IMP(IDirItemsCallback)
-  Z7_IFACE_IMP(IUpdateCallbackUI2)
-
-  HRESULT MoveArc_UpdateStatus();
-
-  UInt64 _arcMoving_total;
-  UInt64 _arcMoving_current;
-  UInt64 _arcMoving_percents;
-  Int32  _arcMoving_updateMode;
 
 public:
-  bool DeleteMessageWasShown;
-
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   bool PasswordIsDefined;
-  bool AskPassword;
   UString Password;
+  bool AskPassword;
   #endif
 
-  CUpdateCallbackConsole():
-        _arcMoving_total(0)
-      , _arcMoving_current(0)
-      , _arcMoving_percents(0)
-      , _arcMoving_updateMode(0)
-      , DeleteMessageWasShown(false)
-      #ifndef Z7_NO_CRYPTO
+  bool DeleteMessageWasShown;
+
+  CUpdateCallbackConsole()
+      : DeleteMessageWasShown(false)
+      #ifndef _NO_CRYPTO
       , PasswordIsDefined(false)
       , AskPassword(false)
       #endif
       {}
-
+  
   /*
   void Init(CStdOutStream *outStream)
   {
@@ -143,6 +118,7 @@ public:
   }
   */
   // ~CUpdateCallbackConsole() { if (NeedPercents()) _percent.ClosePrint(); }
+  INTERFACE_IUpdateCallbackUI2(;)
 };
 
 #endif