Auto upload

Author: Daniel-Chin

.gitignore

@@ -1,2 +1 @@
-beepher.py
 __pycache__/

jdt.py

@@ -58,7 +58,7 @@ def update(self, new_done, symbol = '*', getSuffix = None):
         suffix = getSuffix(new_done, progress)
         msg_and_bar_width = terminal_width - len(suffix)
         msg_width = min(len(self.msg), int(msg_and_bar_width / 2))
-        msg_to_print = self.msg[:msg_width]
+        msg_to_print = self.msg[-msg_width:]
         bar_width = msg_and_bar_width - msg_width
         if bar_width < self.MIN_BAR_WIDTH:
             bar_width = terminal_width - 2
@@ -78,8 +78,9 @@ def acc(self):
     def complete(self):
         def getSuffix(done, progress):
             return 'Complete! Total: %d' % self.goal
-        self.update(self.goal), symbol = '#', getSuffix = getSuffix)
+        self.update(self.goal, symbol = '#', getSuffix = getSuffix)
         self.active = False
+        print()
 
 class CommJdt(Jdt):
     def __init__(self, *argv, **kw):
@@ -97,7 +98,7 @@ def update(self, new_done, *argv, **kw):
             speed = delta_done / delta_time
         def getSuffix(done, progress):
             nonlocal speed
-            return '%s Total: %s Done: %s Speed: %s' % (
+            return '%s Total: %s Done: %s Speed: %s/s' % (
                 format(progress, '4.0%'), 
                 smartUnit(self.goal), 
                 smartUnit(done), 
@@ -108,9 +109,14 @@ def getSuffix(done, progress):
 
 if __name__=='__main__':
     from time import sleep
-    j=CommJdt(10240000)
+    j=CommJdt(10240000, '/sdcard/download/browser/file.jpg')
     for i in range(0,10240000,32345):
         j.update(i)
         sleep(0.01)
     j.complete()
+    j=Jdt(500, 'launching game')
+    for i in range(500):
+        j.acc()
+        sleep(0.01)
+    j.complete()
     input('Enter..')

macro.py renamed to macro/__main__.py

@@ -14,8 +14,7 @@
 import pickle
 import sys
 
-DATA = path.join(path.dirname(__file__), 
-                 'data_' + path.basename(__file__).rstrip('.py'))
+SAVED = path.join(path.dirname(__file__), 'saved')
 
 def main():
     print(__all__)
@@ -188,7 +187,7 @@ def play(macro):
 
 def save(macro):
     name = input('Give your macro a name: ')
-    path_name = path.join(DATA, name)
+    path_name = path.join(SAVED, name)
     if path.isfile(path_name):
         print(name, 'already exists.')
         return
@@ -200,18 +199,18 @@ def load():
     '''
     * to load all. 
     '''
-    list_dir = listdir(DATA)
+    list_dir = listdir(SAVED)
     print('Your macros: {')
     [print('   ', x) for x in list_dir]
     name = input('} which to load? ')
     if name == '*':
         result = {}
         for name in list_dir:
-            with open(path.join(DATA, name), 'rb') as f:
+            with open(path.join(SAVED, name), 'rb') as f:
                 macro = pickle.load(f)
             result[name] = macro
     else:
-        with open(path.join(DATA, name), 'rb') as f:
+        with open(path.join(SAVED, name), 'rb') as f:
             result = pickle.load(f)
     load.last = result
     return result

data_macro/example renamed to macro/saved/example

@@ -3,7 +3,7 @@
 
 def recvFile(socket,file_len,to_filename):
     assert type(socket) is Socket
-    j=jdt.CommJdt(file_len,msg=to_filename[-10:])
+    j=jdt.CommJdt(file_len, msg = to_filename)
     with open(to_filename,'wb+') as to_file:
         left=file_len
         while left: