Update app.py

app.py

@@ -29,13 +29,15 @@ def init(filename=filename,save_data=save_data):
     return lod
 
 
-def sort_doc(in_list,file_state=None,steps_in=0,control=None):
-    
-    lod=init()
+def sort_doc(in_list: list, steps_in: int, control: int, prev_list: str):
+    prev_list=init()
     control_json={'control':'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ','char':'','leng':62}
-    text=str(in_list)
     key_cnt=len(in_list)
     print(key_cnt)
+
+    #if isinstance(in_list, str):
+    #    in_list=eval(in_list)
+
     control_char=list(control_json['control'])
     char_len=len(control_char)    
     if not steps_in:
@@ -46,34 +48,30 @@ def sort_doc(in_list,file_state=None,steps_in=0,control=None):
                 n_cnt+=1
                 nx = nx/char_len
             else:
-                print("#######")
-                print(n_cnt)
-                print(nx)
-                print("#######")
                 steps=n_cnt
                 break    
     if steps_in:
         steps=steps_in
-
     if control:
-        control_len=control_json['leng']-steps
-        control_char_val=list(control_json['control'][:control_len])
+        control_len=control_json['leng']-control
+        control_char=list(control_json['control'][:control_len])
         control_val=list(control_json['control'][control_len:])
         val_len=len(control_val)
-    
-    json_out=lod
-    noun_list={}
-    step_list=[]
+        control_val_box=[]
+        for ea in control_val:
+            control_val_box.append(ea)
+        print(f'CONTROL_VAL_BOX:: {control_val_box}')
+        #prev_list=control_val_box
+    json_out={}
     
     big_cnt=0
     cnt=0
     go=True
-
-
     step_cont_box=[]
-    if lod:
+
+    if prev_list:
         print("LOD")
-        last_key=list(lod.keys())[-1]
+        last_key=list(prev_list.keys())[-1]
         print(last_key)
         for ea_dig in last_key:
             ea_dig=control_json['control'].index(ea_dig)
@@ -83,19 +81,16 @@ def sort_doc(in_list,file_state=None,steps_in=0,control=None):
             step_cont_box.append(ea_dig)
             print(step_cont_box)
         cnt=int(step_cont_box[-1])+1
-    if not lod:
+    if not prev_list:
         print("NOT LOD")
         for ii in range(steps):
             print(ii)
             step_cont_box.append(0)
-    #print (step_cont_box)
-    mod=0
-    pos=len(step_cont_box)-1
 
+    pos=len(step_cont_box)-1
     if go:
         for i, ea in enumerate(in_list):
-            
-            if go and ea not in list(lod.values()):
+            if go:
                 if cnt > char_len-1:
                     #print(step_cont_box)
                     go1=True
@@ -113,21 +108,13 @@ def sort_doc(in_list,file_state=None,steps_in=0,control=None):
                 #print(step_cont_box)
                 out_js=""
                 for iii,j in enumerate(step_cont_box):
-                    print(j)
+                    #print(j)
                     out_js = out_js+control_char[j]
-                sen_obj=in_list[i]    
-                
-                json_out[out_js]=sen_obj
-                #print ("#################")
-                #print (out_js)
-                #print (sen_obj)
-                #print ("#################")
-                
+                json_out[out_js]=in_list[i]
                 big_cnt+=1
                 if big_cnt==key_cnt:
                     print("DONE")
                     go=False
-    #noun_list=proc_nouns(json_out)
     return json_out