github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes to the output module

Browse Source
This commit is contained in:
Mike Fährmann
2017-04-06 16:45:16 +02:00
parent f537ad5f2f
commit 8d5f26d530
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gallery_dl/output.py
View File

@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Copyright 2015, 2016 Mike Fährmann # Copyright 2015-2017 Mike Fährmann
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as # it under the terms of the GNU General Public License version 2 as
@@ -57,7 +57,7 @@ class Printer():
"""Print a message indicating the completion of a download""" """Print a message indicating the completion of a download"""
print(path, flush=True) print(path, flush=True)
def error(self, file, error, tries, max_tries): def error(self, path, error, tries, max_tries):
"""Print a message indicating an error during download""" """Print a message indicating an error during download"""
pass pass
@@ -79,11 +79,11 @@ class TerminalPrinter(Printer):
print("\r", end="") print("\r", end="")
safeprint(self.shorten(CHAR_SUCCESS + path)) safeprint(self.shorten(CHAR_SUCCESS + path))
def error(self, file, error, tries, max_tries): def error(self, path, error, tries, max_tries):
if tries <= 1 and hasattr(file, "name"): if tries <= 1 and path:
print("\r", end="") print("\r", end="")
safeprint(self.shorten(CHAR_ERROR + file.name)) safeprint(self.shorten(CHAR_ERROR + path))
print("[Error] ", end="") print("\r[Error] ", end="")
safeprint(error, end="") safeprint(error, end="")
print(" (", tries, "/", max_tries, ")", sep="") print(" (", tries, "/", max_tries, ")", sep="")
@@ -108,14 +108,12 @@ class ColorPrinter(TerminalPrinter):
print("\033[2m", self.shorten(path), "\033[0m", sep="") print("\033[2m", self.shorten(path), "\033[0m", sep="")
def success(self, path, tries): def success(self, path, tries):
# if tries == 0:
# print("\r", end="")
print("\r\033[1;32m", self.shorten(path), "\033[0m", sep="") print("\r\033[1;32m", self.shorten(path), "\033[0m", sep="")
def error(self, file, error, tries, max_tries): def error(self, path, error, tries, max_tries):
if tries <= 1 and hasattr(file, "name"): if tries <= 1 and path:
print("\r\033[1;31m", self.shorten(file.name), sep="") print("\r\033[1;31m", self.shorten(path), sep="")
print("\033[0;31m[Error]\033[0m ", error, print("\r\033[0;31m[Error]\033[0m ", error,
" (", tries, "/", max_tries, ")", sep="") " (", tries, "/", max_tries, ")", sep="")
@@ -130,6 +128,6 @@ else:
ANSI = True ANSI = True
OFFSET = 0 OFFSET = 0
CHAR_SKIP = "# " CHAR_SKIP = "# "
CHAR_ERROR = "❌ " CHAR_ERROR = "✖ "
CHAR_SUCCESS = "✔ " CHAR_SUCCESS = "✔ "
CHAR_ELLIPSIES = "…" CHAR_ELLIPSIES = "…"