Changeset 1811 for CodeSnippets/VideoTools/shared/tools.py

Timestamp:

12/03/08 13:16:32 (20 months ago)

Author:

JensDiemer

Message:

VideoTools? update

Files:

• CodeSnippets/VideoTools/shared/tools.py (modified) (7 diffs)

CodeSnippets/VideoTools/shared/tools.py

@@ -5 +5 @@
 
 
-def human_filesize(bytes):
+class Humanize(object):
     """
-    >>> human_filesize(1*1024)
+    >>> Humanize().filesize(1023.9)
+    '1023.9bytes'
+    >>> Humanize().filesize(1*1024)
     '1.0KB'
-    >>> human_filesize(1*1024*1024)
-    '1.0MB'
-    >>> human_filesize(1.5*1024*1024)
-    '1.5MB'
+    >>> Humanize().filesize(1.9*1024*1024)
+    '1.9MB'
+    >>> Humanize().filesize(1*1024*1024*1024)
+    '1.0GB'
+    >>> Humanize().filesize(1*1024*1024*1024*1024*1024)
+    '1024.0TB'
+
+    >>> Humanize().time(10.1)
+    '10.1sec'
+    >>> Humanize().time(59.9)
+    '59.9sec'
+    >>> Humanize().time(60)
+    '1.0min'
+    >>> Humanize().time(60*60)
+    '1.0h'
+    >>> Humanize().time(60*60*60)
+    '60.0h'
     """
-    bytes = float(bytes)
-    for unit in ['bytes','KB','MB','GB','TB']:
-        if bytes < 1000:
-            return "%s%s" % (round(bytes,1), unit)
-        bytes /= 1024.0
+    def _humanize(self, source, units, divisor):
+        temp = float(source)
+
+        for unit in units:
+            if temp < divisor:
+                final_value = temp
+                break
+            final_value = temp
+            temp /= divisor
+
+        return "%s%s" % (round(final_value,1), unit)
 
 
+    def filesize(self, bytes):
+        return self._humanize(
+            source = bytes,
+            units = ("bytes", "KB", "MB", "GB", "TB"),
+            divisor = 1024
+        )
+
+    def time(self, sec):
+        return self._humanize(
+            source = sec,
+            units = ("sec", "min", "h"),
+            divisor = 60
+        )
+
+human_filesize = Humanize().filesize
+human_time = Humanize().time
 
 
@@ -28 +65 @@
     """
     delete all non-ALLOW_CHARS characters
-    
+
     >>> make_slug("a test")
     'a test'
@@ -40 +77 @@
         if char not in allow_chars:
             if parts[-1] != "":
-                # No double "-" e.g.: "foo - bar" -> "foo-bar" not "foo---bar"   
+                # No double "-" e.g.: "foo - bar" -> "foo-bar" not "foo---bar"
                 parts.append("")
         else:
@@ -47 +84 @@
     item_name = join_string.join(parts)
     item_name = item_name.strip(join_string)
-    
+
     return item_name
 
@@ -57 +94 @@
     - delete all non-ALLOW_CHARS characters.
     - if the shotcut already exists in name_list -> add a sequential number
-    
+
     >>> makeUnique("two", ["one", "two", "three"])
     'two1'
@@ -107 +144 @@
         if char in ("\r", "\x08"):
             continue
-        
+
         if char == "\n":
             char_count = 0
@@ -117 +154 @@
         if char_count>79:
             sys.stdout.write("\n")
-            char_count = 0            
+            char_count = 0
         sys.stdout.flush()