Skip to content

Basic Windows support #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Basic Windows support #66

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1daa38c
Basic Windows support
Mar 14, 2019
32e83ea
lazy writing support
Mar 16, 2019
1c231cc
No more use of clearln() just +'\r'
Mar 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 49 additions & 6 deletions progress/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

from __future__ import division, print_function

import os
import shutil
from collections import deque
from datetime import timedelta
from math import ceil
Expand All @@ -29,6 +31,14 @@
HIDE_CURSOR = '\x1b[?25l'
SHOW_CURSOR = '\x1b[?25h'

if os.name == 'nt':
import msvcrt
import ctypes

class _CursorInfo(ctypes.Structure):
_fields_ = [("size", ctypes.c_int),
("visible", ctypes.c_byte)]


class Infinite(object):
file = stderr
Expand All @@ -49,9 +59,21 @@ def __init__(self, message='', **kwargs):
self._width = 0
self.message = message

# Lazy writing
self.previous_line = ''

if self.file and self.is_tty():
if self.hide_cursor:
print(HIDE_CURSOR, end='', file=self.file)
if os.name == 'nt':
ci = _CursorInfo()
handle = ctypes.windll.kernel32.GetStdHandle(-11)
ctypes.windll.kernel32.GetConsoleCursorInfo(
handle, ctypes.byref(ci))
ci.visible = False
ctypes.windll.kernel32.SetConsoleCursorInfo(
handle, ctypes.byref(ci))
else:
print(HIDE_CURSOR, end='', file=self.file)
print(self.message, end='', file=self.file)
self.file.flush()

Expand Down Expand Up @@ -87,7 +109,13 @@ def start(self):

def clearln(self):
if self.file and self.is_tty():
print('\r\x1b[K', end='', file=self.file)
if os.name == 'nt':
max_empty_size = min(shutil.get_terminal_size()[
0]-1, len(self.previous_line))
empty_line = max_empty_size * " "
print('\r%s\r' % (empty_line), end='', file=self.file)
else:
print('\r\x1b[K', end='', file=self.file)

def write(self, s):
if self.file and self.is_tty():
Expand All @@ -98,15 +126,30 @@ def write(self, s):

def writeln(self, line):
if self.file and self.is_tty():
self.clearln()
print(line, end='', file=self.file)
self.file.flush()
if line != self.previous_line:
# We are not clearing the line just printing spaces
# at the of the line
# self.clearln()
empty = max(0, len(self.previous_line) - len(line))
empty = min(empty, shutil.get_terminal_size()[0]-1)
print("\r" + line + empty*" ", end='', file=self.file)
self.file.flush()
self.previous_line = line

def finish(self):
if self.file and self.is_tty():
print(file=self.file)
if self.hide_cursor:
print(SHOW_CURSOR, end='', file=self.file)
if os.name == 'nt':
ci = _CursorInfo()
handle = ctypes.windll.kernel32.GetStdHandle(-11)
ctypes.windll.kernel32.GetConsoleCursorInfo(
handle, ctypes.byref(ci))
ci.visible = True
ctypes.windll.kernel32.SetConsoleCursorInfo(
handle, ctypes.byref(ci))
else:
print(SHOW_CURSOR, end='', file=self.file)

def is_tty(self):
return self.file.isatty() if self.check_tty else True
Expand Down