rp 0.1.1271__tar.gz → 0.1.1273__tar.gz

{rp-0.1.1271 → rp-0.1.1273}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1271
+Version: 0.1.1273
 Summary: Ryan's Python
 Home-page: https://github.com/RyannDaGreat/Quick-Python
 Author: Ryan Burgert

{rp-0.1.1271 → rp-0.1.1273}/rp/r.py

@@ -20362,6 +20362,10 @@ def pseudo_terminal(
 
         64P  ans=$printed($string_from_clipboard()) ; $fansi_print($human_readable_file_size(len( ans )), 'bold cyan') ; ans=$base64_to_object(ans)   #Copy object via Base64 String
         64C _ans64=$printed($object_to_base64(ans)) ; $fansi_print($human_readable_file_size(len(_ans64)), 'bold cyan') ; $string_to_clipboard(_ans64) #Copy object via Base64 String
+        64FC  ans=$object_to_base64($r._copy_path_to_bundle(None)); $string_to_clipboard(ans)
+        64FCA ans=$object_to_base64($r._copy_path_to_bundle(ans )); $string_to_clipboard(ans)
+        64FP  ans=$r._paste_path_from_bundle($base64_to_object($string_from_clipboard())) #Copy file via Base64 String
+        64FPA ans=$r._paste_path_from_bundle($base64_to_object(ans                     )) #Copy file via Base64 String
 
         # GO GC
 
@@ -20617,7 +20621,7 @@ def pseudo_terminal(
         RPA $r._relative_path_ans(ans)
         UPA $r._user_path_ans(ans)
 
-        UZA $unzip_to_folder(ans)
+        UZA $unzip_to_folder(ans,show_progress=True)
         ZIH $make_zip_file_from_folder($get_absolute_path('.'))
         ZIA $make_zip_file_from_folder(ans)
 
@@ -20631,6 +20635,12 @@ def pseudo_terminal(
 
         BLA $r._autoformat_python_code_via_black(str(ans))
         SIM $r.sort_imports_via_isort(ans)
+        SIM $r.clean_imports_via_unimport(ans)
+        SW $r.strip_trailing_whitespace(ans)
+        SPC $r.strip_python_comments(ans)
+        SDO $r.strip_python_docstrings(ans)
+        D0L $line_join(x for x in str(ans).splitlines() if x.strip())
+        UND $unindent(ans)
         CBP ans=$string_from_clipboard();ans=$r.autoformat_python_via_black_macchiato(ans);$string_to_clipboard(ans)
         CSP ans=$string_from_clipboard();ans=$sort_imports_via_isort(ans);$string_to_clipboard(ans)
         RMS $r._removestar(ans)
@@ -20755,6 +20765,7 @@ def pseudo_terminal(
                     # region Get user_message, xor exit with second keyboard interrupt
                     _update_cd_history()
                     try:
+                        did_cdb=False
                         def evaluable_part(cmd:str):
                             # DOesn't take into account the ';' character
                             cmd=cmd.rstrip().split('\n')[-1]
@@ -23008,7 +23019,7 @@ def pseudo_terminal(
                                     module_path = get_parent_folder(module_path)
                                 user_message = 'CD '+module_path
 
-                            if user_message.startswith('CD '):
+                            if user_message.startswith('CD ') and not user_message in ['CD .','CD ..']:
                                 #Do fuzzy searching
                                 old_cd_path = user_message[len('CD '):]
                                 new_cd_path = _pterm_fuzzy_cd(old_cd_path)
@@ -23110,6 +23121,7 @@ def pseudo_terminal(
                                     else:
                                         fansi_print("    (Cannot CDB because the CD history is empty)",'red')
                                         cancel=True
+                                    did_cdb=True
                             else:
                                 new_dir=user_message[2:].strip()
                             if cancel:
@@ -23417,6 +23429,9 @@ def pseudo_terminal(
                         #When the folder we're working in is deleted, get_current_directory throws an error
                         #This is ok, just ignore it.
                         pass
+
+                    if did_cdb and len(_cd_history):
+                        _cd_history.pop()
                         
                 except Exception as E:
                     show_error(E)
@@ -29030,11 +29045,7 @@ def get_relative_paths(*paths, root=None):
 
     """
 
-    paths = detuple(paths)
-    if isinstance(paths, str):
-        paths = [paths]
-    else:
-        paths = list(paths)
+    paths = _detuple_paths(paths)
 
     roots = root
     if isinstance(roots, str) or roots is None:
@@ -29056,9 +29067,15 @@ def get_absolute_path(path,*,physical=True):
         path=os.path.realpath(path)#Get rid of any symlinks in the path
     return os.path.abspath(path)
 
+def _detuple_paths(paths):
+    paths=detuple(paths)
+    if isinstance(paths,str):
+        paths=shlex.split(paths)
+    return list(paths)
+
 def get_absolute_paths(*paths,physical=True):
     "Plural of get_absolute_path"
-    return [get_absolute_path(path, physical=physical) for path in detuple(paths)]
+    return [get_absolute_path(path, physical=physical) for path in _detuple_paths(paths)]
 
 def has_file_extension(file_path):
     return get_file_extension(file_path)!=''
@@ -33157,6 +33174,10 @@ def change_video_file_framerate(video_path, new_framerate, output_path=None):
         fansi_print("Error output: " + e.stderr.decode("utf-8"), "red")
         return None
 
+def change_video_file_framerates(video_paths, new_framerate):
+    return [change_video_file_framerate(video_path, new_framerate) for video_path in video_paths]
+
+
 def concat_mp4_files(*input_files, output_file=None):
     """
     Concatenate multiple MP4 files with zero degradation (no recompression).
@@ -45292,19 +45313,25 @@ def zip_folder_to_bytes(folder_path:str):
 class _BundledPath:
     """ A class used internally by rp for web_copy_path and web_paste_path """
     def __init__(self,is_file,data,path):
+        assert isinstance(data,bytes)
         self.is_file=is_file
         self.is_folder=not is_file
         self.data=data
         self.path=path
+    def __repr__(self):
+        return '<rp.r._BundledPath: is_file='+str(self.is_file)+', data='+human_readable_file_size(len(self.data))+', path='+repr(self.path)+'>'
 
 def web_paste_path(path=None,*,ask_to_replace=True):
     """ FP (file paste) """
-    data=web_paste()
+    data = web_paste()
+    return gather_args_call(_paste_path_from_bundle, data,path=path)
+
+def _paste_path_from_bundle(data,path=None, *,ask_to_replace=True):
     try:
-        data=bytes_to_object(data)
         assert isinstance(data,_BundledPath)
     except Exception:
         raise Exception('web_paste_path error: web_paste data was not created via web_copy_path')
+
     def request_replace(path)->bool:
         return input_yes_no(fansi("Replace "+get_file_name(path)+"?",'yellow'))
     if path is None and data.path=='.' and data.is_folder:
@@ -45344,13 +45371,18 @@ def web_paste_path(path=None,*,ask_to_replace=True):
 
 def web_copy_path(path:str=None, *, show_progress=False):
     """ FC (file copy) """
+    web_copy(_copy_path_to_bundle(path), show_progress=show_progress)
+    return path
+
+def _copy_path_to_bundle(path:str=None):
     if path is None:
         path=input_select_path(message='Select a file or folder for web_copy_path:')
         path=get_relative_path(path)
     assert path_exists(path),'Path does not exist: '+str(path)
     data=file_to_bytes(path) if is_a_file(path) else zip_folder_to_bytes(path)
-    web_copy(object_to_bytes(_BundledPath(is_a_file(path),data,path)), show_progress=show_progress)
-    return path
+    file_object = _BundledPath(is_a_file(path),data,path)
+    return file_object
+
 
 def get_all_local_ip_addresses():
     """
@@ -50537,7 +50569,8 @@ known_pypi_module_package_names={
     'colors': 'ansicolors',
     'compose': 'docker-compose',
     # 'cv2': 'opencv-python',
-    'cv2': 'opencv-contrib-python', #This one is just like opencv, but better...but does it install as reliably? (Update: so far, so good!)
+    # 'cv2': 'opencv-contrib-python', #This one is just like opencv, but better...but does it install as reliably? (Update: so far, so good!)
+    'cv2': 'opencv-python opencv-contrib-python', #But that didn't work for get_edge_drawing...https://github.com/Comfy-Org/ComfyUI-Manager/discussions/708
     'cython': 'Cython',
     'deprecate': 'pyDeprecate',
     'diff_match_patch': 'diff-match-patch',

{rp-0.1.1271 → rp-0.1.1273}/rp/rp_ptpython/key_bindings.py

@@ -1341,7 +1341,8 @@ def handle_character(buffer,char,event=None):
         lines=text.splitlines()
         lines=[line[1:] for line in lines]
         text='\n'.join(lines)
-        buffer.document=Document((text),min(len(text),buffer.document.cursor_position),buffer.document.selection)
+        replace_buffer_text(buffer, text)
+        # buffer.document=Document((text),min(len(text),buffer.document.cursor_position),buffer.document.selection)
         return True
 
     if char=='v' and meta_pressed(clear=True):
@@ -2803,6 +2804,8 @@ def load_python_bindings(python_input):
                         #                  '\\el':'el'}#go e
                         header_arg_commands={
                                              '\\re':'replace',
+                                             '\\rre':'replace_varname',
+                                             '\\ev':'extract_variable',
                                              '\\py':'python',
                                              '\\dtl':'delete to line',
                                              '\\go':'goto',
@@ -2897,6 +2900,12 @@ def load_python_bindings(python_input):
                                          '\\dilp':'diff_local_paste',
                                          '\\diph':'diff_pt_history',
                                          '\\qph':'query_pt_history',
+                                         '\\und':'unindent',
+                                         '\\ind':'indent',
+                                         '\\rcl':'reverse_columns',
+                                         '\\stp':'strip',
+                                         '\\spl':'splitlines',
+                                         '\\lj':'line_join',
                                          '\\irp':'inline_rp',
                                          '\\qrp':'qualify_rp',
                                          '\\inm':'if_name_main',
@@ -2912,7 +2921,7 @@ def load_python_bindings(python_input):
                                 # if command in header_jump_commands:
                                 #     jump_cursor_to_beginning_of_header(chopped_command,header)
                                 if command in header_arg_commands and '`' in before_line:
-                                    if header=='replace':
+                                    if header.startswith('replace'):
                                         #DEMO: Type
                                         #`foo`bar\r
                                         #into the buffer (with a whole bunch of foo's which will be turned into bar's')
@@ -2921,7 +2930,22 @@ def load_python_bindings(python_input):
                                             arg2=before_line.split('`')[2].split('\\')[0]
                                             buffer.delete_before_cursor(len(arg1+'`'+arg2+'`'))
                                             text=buffer.document.text.replace(arg1,arg2)
-                                            buffer.document=Document(text,buffer.document.cursor_position,buffer.document.selection)
+                                            replace_buffer_text(buffer, text)
+                                            if header=='replace_varname':
+                                                buffer.insert_text(arg2)
+                                            # buffer.document=Document(text,buffer.document.cursor_position,buffer.document.selection)
+                                    if header=='extract_variable':
+                                        if before_line.count('`')==2:#dumb assumption im makin
+                                            arg1=before_line.split('`')[1]
+                                            arg2=before_line.split('`')[2].split('\\')[0]
+                                            buffer.delete_before_cursor(len(arg1+'`'+arg2+'`'))
+                                            indent=get_indent(before_line)
+                                            buffer.insert_text(arg2)
+                                            buffer.insert_line_above()
+                                            buffer.insert_text(arg2+' = '+arg1)
+
+                                            # buffer.document=Document(text,buffer.document.cursor_position,buffer.document.selection)
+
                                     if header=='cancel':
                                         #Cancel whatever command you've written and delete it. Beats having to delete it manually.
                                         if before_line.count('`')==2:#dumb assumption im makin
@@ -3106,6 +3130,53 @@ def load_python_bindings(python_input):
                                     buffer.delete_before_cursor(len(before_line))
                                     buffer.delete(len(after_line))
                                     buffer.insert_text(swap_from_import(current_line))
+                                if header=='strip':
+                                    text=buffer.document.text.strip()
+                                    replace_buffer_text(buffer, text)
+                                if header=='unindent':
+                                    import rp
+                                    text=buffer.document.text
+                                    text=rp.unindent(text)
+                                    replace_buffer_text(buffer, text)
+                                if header=='indent':
+                                    import rp
+                                    text=buffer.document.text
+                                    text=rp.indentify(text,'    ')
+                                    replace_buffer_text(buffer, text)
+                                if header=='reverse_columns':
+                                    import rp
+                                    text=buffer.document.text
+                                    text='\n'.join(x[::-1] for x in text.splitlines())
+                                    replace_buffer_text(buffer, text)
+                                if header=='splitlines' or header=='line_join':
+                                    import rp
+                                    text=buffer.document.text
+
+                                    def do_linejoin(text):
+                                        import ast
+                                        try:
+                                            lines = ast.literal_eval(text)
+                                            if isinstance(lines, list):
+                                                result = '\n'.join(map(str,lines))
+                                                return result
+                                        except Exception as e:
+                                            pass
+                                            # return str(e)
+                                        return None
+                                    linejoin_result = do_linejoin(text)
+
+                                    if header=='splitlines' or not linejoin_result:
+                                        text='\n'.join([
+                                            '[',
+                                            *['    '+repr(line)+',' for line in text.splitlines()],
+                                            ']',
+                                            ])
+                                        buffer.cursor_down()
+                                    else:
+                                        text=linejoin_result
+                                        # buffer.cursor_up()
+                                    # text=rp.autoformat_python_via_black(text)
+                                    replace_buffer_text(buffer, text)
                                 if header=='enumerate':
                                     def uses_enumerate(line):
                                         ans=line
@@ -3236,7 +3307,7 @@ def load_python_bindings(python_input):
                                     buffer.insert_text('if __name__ == "__main__":\n    ')
                                 if header=='repr':
                                     #A shortcut to `repr\py
-                                    text=buffer.document.text
+                                    text=repr(buffer.document.text)
                                     # buffer.document=Document(repr(text),min(len(text),buffer.document.cursor_position),buffer.document.selection)
                                     replace_buffer_text(buffer, text)
                                 if header=='black':

rp-0.1.1273/rp/version.py

@@ -0,0 +1 @@
+1273

{rp-0.1.1271 → rp-0.1.1273}/rp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: rp
-Version: 0.1.1271
+Version: 0.1.1273
 Summary: Ryan's Python
 Home-page: https://github.com/RyannDaGreat/Quick-Python
 Author: Ryan Burgert

rp-0.1.1273/version.py

@@ -0,0 +1 @@
+1273

rp-0.1.1271/rp/version.py

@@ -1 +0,0 @@
-1271

rp-0.1.1271/version.py

@@ -1 +0,0 @@
-1271