voussoirkit/ffmpegtools.py

@@ -1,45 +0,0 @@
-import subprocess
-import os
-import tempfile
-
-from voussoirkit import pathclass
-
-def concatenate(input_files, output_file):
-    '''
-    Conveniently runs `ffmpeg -f concat` via subprocess.
-    '''
-    if len(input_files) < 2:
-        raise ValueError('Only one input file.')
-
-    input_files = [pathclass.Path(f) for f in input_files]
-
-    for file in input_files:
-        file.assert_is_file()
-
-    output_file = pathclass.Path(output_file)
-
-    names = [f.absolute_path for f in input_files]
-    names = [name.replace("'", "'\\''") for name in names]
-    cat_lines = [f'file \'{x}\'' for x in names]
-    cat_text = '\n'.join(cat_lines)
-    cat_file = tempfile.TemporaryFile('w', encoding='utf-8', delete=False)
-    cat_file.write(cat_text)
-    cat_file.close()
-
-    command = [
-        'ffmpeg',
-        '-f', 'concat',
-        '-safe', '0',
-        '-i', cat_file.name,
-        '-map', '0:v?',
-        '-map', '0:a?',
-        '-map', '0:s?',
-        '-c', 'copy',
-        output_file.absolute_path,
-    ]
-
-    subprocess.check_call(command)
-
-    os.remove(cat_file.name)
-
-    return output_file

voussoirkit/httperrors.py

@@ -35,11 +35,7 @@ code will not be affected.
 '''
 import requests
 
-class HTTPError(requests.exceptions.HTTPError):
-    def __str__(self):
-        return type(self).__name__
-
-class HTTP4XX(HTTPError): pass
+class HTTP4XX(requests.exceptions.HTTPError): pass
 class HTTP400(HTTP4XX): pass
 class HTTP401(HTTP4XX): pass
 class HTTP402(HTTP4XX): pass
@@ -141,7 +137,7 @@ class HTTP497(HTTP4XX): pass
 class HTTP498(HTTP4XX): pass
 class HTTP499(HTTP4XX): pass
 
-class HTTP5XX(HTTPError): pass
+class HTTP5XX(requests.exceptions.HTTPError): pass
 class HTTP500(HTTP5XX): pass
 class HTTP501(HTTP5XX): pass
 class HTTP502(HTTP5XX): pass

voussoirkit/pathclass.py

@@ -135,7 +135,6 @@ class Path:
             self._parts = path._parts
             self._absolute_path = path._absolute_path
             self._extension = path._extension
-            self._case_correct = path._case_correct
             return
 
         if isinstance(path, (tuple, list)):

voussoirkit/spinal.py

@@ -283,7 +283,6 @@ def copy_directory(
     written_bytes = 0
 
     for (source_file, destination_file) in walker:
-        log.loud(f'Working on file {source_file.absolute_path}.')
         if not source_file.is_file:
             log.warning('%s disappeared during directory copy.', source_file.absolute_path)
             continue
@@ -483,7 +482,6 @@ def copy_file(
     )
 
     if not should_overwrite:
-        log.loud(f'Don\'t need to overwrite {destination.absolute_path}.')
         return results
 
     if dry_run:
@@ -491,7 +489,6 @@ def copy_file(
         return results
 
     if callback_pre_copy(source, destination, dry_run=dry_run) is BAIL:
-        log.loud('Bailing due to callback_pre_copy.')
         return results
 
     destination.parent.makedirs(exist_ok=True)

voussoirkit/windrives.py

@@ -14,7 +14,7 @@ log = vlogging.getLogger(__name__, 'windrives')
 
 def get_all_volumes():
     '''
-    Return a list of volume paths like \\\\?\\Volume{GUID}\\ for all volumes,
+    Return a list of volume paths like \\?\Volume{GUID}\ for all volumes,
     whether they are mounted or not.
 
     Note: This will include recovery / EFI partitions, which may not be what
@@ -55,9 +55,9 @@ def get_all_volumes():
 def get_drive_info(path):
     '''
     Given a drive path as either:
-    - a letter like C or C:\\, or
+    - a letter like C or C:\, or
     - a mount path, or
-    - a volume path like \\\\?\\Volume{GUID},
+    - a volume path like \\?\Volume{GUID},
     return a dictionary containing its attributes.
 
     Thanks Nicholas Orlowski
@@ -132,7 +132,7 @@ def get_drive_map():
 def get_drive_mounts():
     '''
     Return a list of all connected drives as either:
-    - a letter like C:\\ if the volume has a letter, or
+    - a letter like C:\ if the volume has a letter, or
     - a mount path if the volume does not have a letter.
     '''
     mounts = []
@@ -157,8 +157,8 @@ def get_drive_mount_by_name(name):
 
 def get_volume_mount(volume):
     '''
-    Given a volume path like \\\\?\\Volume{GUID}\\, return either:
-    - a letter like C:\\ if the volume has a letter, or
+    Given a volume path like \\?\Volume{GUID}\, return either:
+    - a letter like C:\ if the volume has a letter, or
     - a mount path if the volume does not have a letter, or
     - emptystring if the volume is not mounted at all.
 

voussoirkitjs/hotkeys.js

@@ -38,7 +38,7 @@ function register_hotkey(hotkey, action, description)
     }
 
     const key = hotkey.pop();
-    const modifiers = hotkey.map(word => word.toLocaleLowerCase());
+    modifiers = hotkey.map(word => word.toLocaleLowerCase());
     const ctrlKey = modifiers.includes("control") || modifiers.includes("ctrl");
     const shiftKey = modifiers.includes("shift");
     const altKey = modifiers.includes("alt");
@@ -96,7 +96,7 @@ function hotkeys_listener(event)
         return;
     }
 
-    const identifier = hotkeys.hotkey_identifier(event.key, event.ctrlKey, event.shiftKey, event.altKey);
+    identifier = hotkeys.hotkey_identifier(event.key, event.ctrlKey, event.shiftKey, event.altKey);
     //console.log(identifier);
     if (identifier in hotkeys.HOTKEYS)
     {