From 44a54978b97b098780f4b3f224bd0e0e53686afa Mon Sep 17 00:00:00 2001 From: Goffi Date: Wed, 8 Sep 2021 17:58:48 +0200 Subject: [PATCH] CLI: move `format_time` to `common` + add timezone --- sat_frontends/jp/cmd_blog.py | 18 ++++-------------- sat_frontends/jp/common.py | 10 ++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sat_frontends/jp/cmd_blog.py b/sat_frontends/jp/cmd_blog.py index d7f7f5f1..2b97e9d2 100644 --- a/sat_frontends/jp/cmd_blog.py +++ b/sat_frontends/jp/cmd_blog.py @@ -22,7 +22,6 @@ import json import sys import os.path import os -import time import tempfile import subprocess import asyncio @@ -290,10 +289,10 @@ class Get(base.CommandBase): return ", ".join(tags) def format_updated(self, item, keys): - return self.format_time(item["updated"]) + return common.format_time(item["updated"]) def format_published(self, item, keys): - return self.format_time(item["published"]) + return common.format_time(item["published"]) def format_url(self, item, keys): return uri.buildXMPPUri( @@ -372,15 +371,6 @@ class Get(base.CommandBase): if idx < len(items) - 1: print("") - def format_time(self, timestamp): - """return formatted date for timestamp - - @param timestamp(str,int,float): unix timestamp - @return (unicode): formatted date - """ - fmt = "%d/%m/%Y %H:%M:%S" - return time.strftime(fmt, time.localtime(float(timestamp))) - def fancy_output(self, data): """display blog is a nice to read way @@ -413,10 +403,10 @@ class Get(base.CommandBase): if author: meta.append(A.color(A.FG_YELLOW, author)) if published: - meta.append(A.color(A.FG_YELLOW, "on ", self.format_time(published))) + meta.append(A.color(A.FG_YELLOW, "on ", common.format_time(published))) if updated != published: meta.append( - A.color(A.FG_YELLOW, "(updated on ", self.format_time(updated), ")") + A.color(A.FG_YELLOW, "(updated on ", common.format_time(updated), ")") ) print((" ".join(meta))) if tags: diff --git a/sat_frontends/jp/common.py b/sat_frontends/jp/common.py index 7c9ecc6e..a56fc6dd 100644 --- a/sat_frontends/jp/common.py +++ b/sat_frontends/jp/common.py @@ -52,6 +52,16 @@ SECURE_UNLINK_DIR = ".backup" METADATA_SUFF = "_metadata.json" +def format_time(timestamp): + """Return formatted date for timestamp + + @param timestamp(str,int,float): unix timestamp + @return (unicode): formatted date + """ + fmt = "%d/%m/%Y %H:%M:%S %Z" + return time.strftime(fmt, time.localtime(float(timestamp))) + + def ansi_ljust(s, width): """ljust method handling ANSI escape codes""" cleaned = regex.ansiRemove(s)