Skip to content

Commit

Permalink
Merge pull request #110 from seanson/fix/windows_paths
Browse files Browse the repository at this point in the history
fix: Use pathlib to mitigate issues with Windows paths on local files
  • Loading branch information
antiboredom authored Jul 12, 2022
2 parents 9ee3c13 + 366dff3 commit 85c8298
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
9 changes: 5 additions & 4 deletions tests/test_videogrep.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
import os
import re
from collections import Counter
from pathlib import Path
from moviepy.editor import VideoFileClip
from pytest import approx
import glob
import subprocess


def File(path):
return os.path.join(os.path.dirname(__file__), path)
return str(Path(__file__).parent / Path(path))


def test_version():
Expand Down Expand Up @@ -208,7 +209,7 @@ def test_export_files():
export_clips=True,
output=out1,
)
files = glob.glob(File("test_outputs/") + "supercut_clip*.mp4")
files = glob.glob(File("test_outputs/supercut_clip*.mp4"))
assert len(files) == 4
testfile = VideoFileClip(files[0])
assert testfile.duration == approx(0.52)
Expand Down Expand Up @@ -382,7 +383,6 @@ def test_sentence_search_vtt():
def test_cli():
infile = File("test_inputs/manifesto.mp4")
outfile = File("test_outputs/supercut.mp4")

subprocess.run(
[
"poetry",
Expand All @@ -398,7 +398,8 @@ def test_cli():
"fragment",
"--max-clips",
"1",
]
],
shell=True,
)

clip = VideoFileClip(outfile)
Expand Down
3 changes: 2 additions & 1 deletion videogrep/videogrep.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import gc
import time
from . import vtt, srt, sphinx, fcpxml
from pathlib import Path
from typing import Optional, List, Union, Iterator

from moviepy.editor import VideoFileClip, concatenate_videoclips
Expand All @@ -29,7 +30,7 @@ def find_transcript(videoname: str, prefer: Optional[str] = None) -> Optional[st
if prefer is not None:
_sub_exts = [prefer] + SUB_EXTS

all_files = [f.path for f in os.scandir(os.path.dirname(videoname)) if f.is_file()]
all_files = [str(f) for f in Path(videoname).parent.iterdir() if f.is_file()]

for ext in _sub_exts:
pattern = (
Expand Down

0 comments on commit 85c8298

Please sign in to comment.