diff --git a/contentreplace.py b/contentreplace.py index 741773a..a35e37c 100644 --- a/contentreplace.py +++ b/contentreplace.py @@ -1,10 +1,11 @@ import argparse import codecs -import glob import pyperclip import re import sys +from voussoirkit import winglob + def contentreplace(filename, replace_from, replace_to, autoyes=False, do_regex=False): f = open(filename, 'r', encoding='utf-8') @@ -34,7 +35,7 @@ def contentreplace(filename, replace_from, replace_to, autoyes=False, do_regex=F f.write(content) def contentreplace_argparse(args): - filenames = glob.glob(args.filename_glob) + filenames = winglob.glob(args.filename_glob) if args.clip_prompt: replace_from = input('Ready from') diff --git a/crlf.py b/crlf.py index 2155e82..3eb31ca 100644 --- a/crlf.py +++ b/crlf.py @@ -1,12 +1,10 @@ ''' Convert LF line endings to CRLF. ''' - -import glob import sys from voussoirkit import pipeable - +from voussoirkit import winglob CR = b'\x0D' LF = b'\x0A' @@ -22,7 +20,7 @@ def crlf(filename): def main(args): for line in pipeable.go(args, strip=True, skip_blank=True): - for filename in glob.glob(line): + for filename in winglob.glob(line): pipeable.output(filename) crlf(filename) diff --git a/ffaudios.py b/ffaudios.py index 15e4957..739cf7b 100644 --- a/ffaudios.py +++ b/ffaudios.py @@ -1,7 +1,6 @@ import argparse import re import subprocess -import glob import sys from voussoirkit import pathclass diff --git a/filetimelapse.py b/filetimelapse.py index 57b93c9..5546562 100644 --- a/filetimelapse.py +++ b/filetimelapse.py @@ -4,7 +4,6 @@ Not a replacement for real version control but could be applicable in very simpl cases where e.g. git is not. ''' import argparse -import glob import hashlib import os import shutil @@ -13,6 +12,7 @@ import time from voussoirkit import bytestring from voussoirkit import pathclass +from voussoirkit import winglob def hash_file(filepath, hasher): bytestream = read_filebytes(filepath) @@ -44,7 +44,7 @@ def filetimelapse(filepath, rate): (noext, extension) = os.path.splitext(filepath) last_hash = None - existing_timelapses = glob.glob(f'{noext}-*.filetimelapse{extension}') + existing_timelapses = winglob.glob(f'{noext}-*.filetimelapse{extension}') if existing_timelapses: last_hash = hash_file_md5(existing_timelapses[-1]) print(f'Starting with previous {existing_timelapses[-1]} {last_hash}') diff --git a/replace.py b/replace.py index e547daa..9dac3a4 100644 --- a/replace.py +++ b/replace.py @@ -1,4 +1,3 @@ -import glob import sys from voussoirkit import pipeable diff --git a/resize.py b/resize.py index 5c28f84..edfdea5 100644 --- a/resize.py +++ b/resize.py @@ -1,8 +1,9 @@ -import glob import os from PIL import Image import sys +from voussoirkit import winglob + def fit_into_bounds(image_width, image_height, frame_width, frame_height): ''' Given the w+h of the image and the w+h of the frame, @@ -22,7 +23,7 @@ def fit_into_bounds(image_width, image_height, frame_width, frame_height): filenames = sys.argv[1] -filenames = glob.glob(filenames) +filenames = winglob.glob(filenames) for filename in filenames: i = Image.open(filename) if all(x.isdigit() for x in sys.argv[2:3]): diff --git a/touch.py b/touch.py index bf94858..5e10d5d 100644 --- a/touch.py +++ b/touch.py @@ -1,15 +1,15 @@ ''' Create the file, or update the last modified timestamp. ''' -import glob import os import sys from voussoirkit import clipext from voussoirkit import safeprint +from voussoirkit import winglob def touch(glob_pattern): - filenames = glob.glob(glob_pattern) + filenames = winglob.glob(glob_pattern) if len(filenames) == 0: safeprint.safeprint(glob_pattern) open(glob_pattern, 'a').close()