Release 1.2.3

[apt.git] / apt-pkg / install-progress.cc

diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index 96334b00652f76e96415ab444a539dea531faaf7..14409e301437c5b1c9ae434b12d6fca09a5720fa 100644 (file)
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -8,19 +8,20 @@
 #include <signal.h>
 #include <unistd.h>
 #include <iostream>
 #include <signal.h>
 #include <unistd.h>
 #include <iostream>

-#include <string>

 #include <vector>
 #include <sys/ioctl.h>
 #include <vector>
 #include <sys/ioctl.h>

-#include <sstream>

 #include <fcntl.h>
 #include <algorithm>
 #include <stdio.h>
 #include <fcntl.h>
 #include <algorithm>
 #include <stdio.h>

+#include <sstream>

 
 #include <apti18n.h>
 
 namespace APT {
 namespace Progress {
 
 
 #include <apti18n.h>
 
 namespace APT {
 namespace Progress {
 

+PackageManager::PackageManager() : d(NULL), percentage(0.0), last_reported_progress(-1) {}
+PackageManager::~PackageManager() {}

 
 /* Return a APT::Progress::PackageManager based on the global
  * apt configuration (i.e. APT::Status-Fd and APT::Status-deb822-Fd)
 
 /* Return a APT::Progress::PackageManager based on the global
  * apt configuration (i.e. APT::Status-Fd and APT::Status-deb822-Fd)


@@ -63,10 +64,11 @@ bool PackageManager::StatusChanged(std::string /*PackageName*/,
 }
 
 PackageManagerProgressFd::PackageManagerProgressFd(int progress_fd)
 }
 
 PackageManagerProgressFd::PackageManagerProgressFd(int progress_fd)

-   : StepsDone(0), StepsTotal(1)
+   : d(NULL), StepsDone(0), StepsTotal(1)

 {
    OutStatusFd = progress_fd;
 }
 {
    OutStatusFd = progress_fd;
 }

+PackageManagerProgressFd::~PackageManagerProgressFd() {}

 
 void PackageManagerProgressFd::WriteToStatusFd(std::string s)
 {
 
 void PackageManagerProgressFd::WriteToStatusFd(std::string s)
 {


@@ -151,10 +153,11 @@ bool PackageManagerProgressFd::StatusChanged(std::string PackageName,
 
 
 PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int progress_fd)
 
 
 PackageManagerProgressDeb822Fd::PackageManagerProgressDeb822Fd(int progress_fd)

-   : StepsDone(0), StepsTotal(1)
+   : d(NULL), StepsDone(0), StepsTotal(1)

 {
    OutStatusFd = progress_fd;
 }
 {
    OutStatusFd = progress_fd;
 }

+PackageManagerProgressDeb822Fd::~PackageManagerProgressDeb822Fd() {}

 
 void PackageManagerProgressDeb822Fd::WriteToStatusFd(std::string s)
 {
 
 void PackageManagerProgressDeb822Fd::WriteToStatusFd(std::string s)
 {


@@ -231,7 +234,7 @@ bool PackageManagerProgressDeb822Fd::StatusChanged(std::string PackageName,
 
 
 PackageManagerFancy::PackageManagerFancy()
 
 
 PackageManagerFancy::PackageManagerFancy()

-   : child_pty(-1)
+   : d(NULL), child_pty(-1)

 {
    // setup terminal size
    old_SIGWINCH = signal(SIGWINCH, PackageManagerFancy::staticSIGWINCH);
 {
    // setup terminal size
    old_SIGWINCH = signal(SIGWINCH, PackageManagerFancy::staticSIGWINCH);


@@ -252,17 +255,22 @@ void PackageManagerFancy::staticSIGWINCH(int signum)
       (*I)->HandleSIGWINCH(signum);
 }
 
       (*I)->HandleSIGWINCH(signum);
 }
 

-int PackageManagerFancy::GetNumberTerminalRows()
+PackageManagerFancy::TermSize
+PackageManagerFancy::GetTerminalSize()

 {
    struct winsize win;
 {
    struct winsize win;

+   PackageManagerFancy::TermSize s = { 0, 0 };
+

    // FIXME: get from "child_pty" instead?
    if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) != 0)
    // FIXME: get from "child_pty" instead?
    if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) != 0)

-      return -1;
+      return s;

 
    if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
 
    if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)

-      std::cerr << "GetNumberTerminalRows: " << win.ws_row << std::endl;
-   
-   return win.ws_row;
+      std::cerr << "GetTerminalSize: " << win.ws_row << " x " << win.ws_col << std::endl;
+
+   s.rows = win.ws_row;
+   s.columns = win.ws_col;
+   return s;

 }
 
 void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
 }
 
 void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)


@@ -270,18 +278,21 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
      if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
         std::cerr << "SetupTerminalScrollArea: " << nr_rows << std::endl;
 
      if(_config->FindB("Debug::InstallProgress::Fancy", false) == true)
         std::cerr << "SetupTerminalScrollArea: " << nr_rows << std::endl;
 

+     if (unlikely(nr_rows <= 1))
+       return;
+

      // scroll down a bit to avoid visual glitch when the screen
      // area shrinks by one row
      std::cout << "\n";
          
      // save cursor
      // scroll down a bit to avoid visual glitch when the screen
      // area shrinks by one row
      std::cout << "\n";
          
      // save cursor

-     std::cout << "\033[s";
+     std::cout << "\0337";

          
      // set scroll region (this will place the cursor in the top left)
      std::cout << "\033[0;" << nr_rows - 1 << "r";
             
      // restore cursor but ensure its inside the scrolling area
          
      // set scroll region (this will place the cursor in the top left)
      std::cout << "\033[0;" << nr_rows - 1 << "r";
             
      // restore cursor but ensure its inside the scrolling area

-     std::cout << "\033[u";
+     std::cout << "\0338";

      static const char *move_cursor_up = "\033[1A";
      std::cout << move_cursor_up;
 
      static const char *move_cursor_up = "\033[1A";
      std::cout << move_cursor_up;
 


@@ -291,28 +302,30 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
      // setup tty size to ensure xterm/linux console are working properly too
      // see bug #731738
      struct winsize win;
      // setup tty size to ensure xterm/linux console are working properly too
      // see bug #731738
      struct winsize win;

-     ioctl(child_pty, TIOCGWINSZ, (char *)&win);
-     win.ws_row = nr_rows - 1;
-     ioctl(child_pty, TIOCSWINSZ, (char *)&win);
+     if (ioctl(child_pty, TIOCGWINSZ, (char *)&win) != -1)
+     {
+       win.ws_row = nr_rows - 1;
+       ioctl(child_pty, TIOCSWINSZ, (char *)&win);
+     }

 }
 
 void PackageManagerFancy::HandleSIGWINCH(int)
 {
 }
 
 void PackageManagerFancy::HandleSIGWINCH(int)
 {

-   int nr_terminal_rows = GetNumberTerminalRows();
+   int const nr_terminal_rows = GetTerminalSize().rows;

    SetupTerminalScrollArea(nr_terminal_rows);
    SetupTerminalScrollArea(nr_terminal_rows);

+   DrawStatusLine();

 }
 
 void PackageManagerFancy::Start(int a_child_pty)
 {
    child_pty = a_child_pty;
 }
 
 void PackageManagerFancy::Start(int a_child_pty)
 {
    child_pty = a_child_pty;

-   int nr_terminal_rows = GetNumberTerminalRows();
-   if (nr_terminal_rows > 0)
-      SetupTerminalScrollArea(nr_terminal_rows);
+   int const nr_terminal_rows = GetTerminalSize().rows;
+   SetupTerminalScrollArea(nr_terminal_rows);

 }
 
 void PackageManagerFancy::Stop()
 {
 }
 
 void PackageManagerFancy::Stop()
 {

-   int nr_terminal_rows = GetNumberTerminalRows();
+   int const nr_terminal_rows = GetTerminalSize().rows;

    if (nr_terminal_rows > 0)
    {
       SetupTerminalScrollArea(nr_terminal_rows + 1);
    if (nr_terminal_rows > 0)
    {
       SetupTerminalScrollArea(nr_terminal_rows + 1);


@@ -324,6 +337,26 @@ void PackageManagerFancy::Stop()
    child_pty = -1;
 }
 
    child_pty = -1;
 }
 

+std::string 
+PackageManagerFancy::GetTextProgressStr(float Percent, int OutputSize)
+{
+   std::string output;
+   int i;
+   
+   // should we raise a exception here instead?
+   if (Percent < 0.0 || Percent > 1.0 || OutputSize < 3)
+      return output;
+   
+   int BarSize = OutputSize - 2; // bar without the leading "[" and trailing "]"
+   output += "[";
+   for(i=0; i < BarSize*Percent; i++)
+      output += "#";
+   for (/*nothing*/; i < BarSize; i++)
+      output += ".";
+   output += "]";
+   return output;
+}
+

 bool PackageManagerFancy::StatusChanged(std::string PackageName, 
                                         unsigned int StepsDone,
                                         unsigned int TotalSteps,
 bool PackageManagerFancy::StatusChanged(std::string PackageName, 
                                         unsigned int StepsDone,
                                         unsigned int TotalSteps,


@@ -333,10 +366,16 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName,
           HumanReadableAction))
       return false;
 
           HumanReadableAction))
       return false;
 

-   int row = GetNumberTerminalRows();
+   return DrawStatusLine();
+}
+bool PackageManagerFancy::DrawStatusLine()
+{
+   PackageManagerFancy::TermSize const size = GetTerminalSize();
+   if (unlikely(size.rows < 1 || size.columns < 1))
+      return false;

 
 

-   static std::string save_cursor = "\033[s";
-   static std::string restore_cursor = "\033[u";
+   static std::string save_cursor = "\0337";
+   static std::string restore_cursor = "\0338";

 
    // green
    static std::string set_bg_color = DeQuoteString(
 
    // green
    static std::string set_bg_color = DeQuoteString(


@@ -350,14 +389,30 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName,
 
    std::cout << save_cursor
       // move cursor position to last row
 
    std::cout << save_cursor
       // move cursor position to last row

-             << "\033[" << row << ";0f" 
+             << "\033[" << size.rows << ";0f" 

              << set_bg_color
              << set_fg_color
              << progress_str
              << set_bg_color
              << set_fg_color
              << progress_str

-             << restore_cursor

              << restore_bg
              << restore_fg;
    std::flush(std::cout);
              << restore_bg
              << restore_fg;
    std::flush(std::cout);

+
+   // draw text progress bar
+   if (_config->FindB("Dpkg::Progress-Fancy::Progress-Bar", true))
+   {
+      int padding = 4;
+      float progressbar_size = size.columns - padding - progress_str.size();
+      float current_percent = percentage / 100.0;
+      std::cout << " " 
+                << GetTextProgressStr(current_percent, progressbar_size)
+                << " ";
+      std::flush(std::cout);
+   }
+
+   // restore
+   std::cout << restore_cursor;
+   std::flush(std::cout);
+

    last_reported_progress = percentage;
 
    return true;
    last_reported_progress = percentage;
 
    return true;


@@ -379,6 +434,10 @@ bool PackageManagerText::StatusChanged(std::string PackageName,
    return true;
 }
 
    return true;
 }
 

+PackageManagerText::PackageManagerText() : PackageManager(), d(NULL) {}
+PackageManagerText::~PackageManagerText() {}
+
+

 
 
 } // namespace progress
 
 
 } // namespace progress