Skip to content
This repository was archived by the owner on Mar 6, 2025. It is now read-only.

Commit b886027

Browse files
committed
pylivestream.glob => .fglob to not shadow stdlib glob
1 parent 1d6a90b commit b886027

File tree

7 files changed

+15
-15
lines changed

7 files changed

+15
-15
lines changed

File-Streaming.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ python -m pylivestream.loopfile videofile site
1515
Glob list of video files to stream:
1616

1717
```sh
18-
python -m pylivestream.glob path site -glob glob_pattern
18+
python -m pylivestream.fglob path site -glob glob_pattern
1919
```
2020

21-
* `-glob` glob pattern of files to stream e.g. "*.avi". For [recursive globbing](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob), do like "**/*.avi".
21+
* `-glob` glob pattern of files to stream e.g. `*.avi`. For [recursive globbing](https://docs.python.org/3/library/pathlib.html#pathlib.Path.glob), do like `**/*.avi`.
2222
* `-loop` optionally loop endlessly the globbed file list
2323
* `-shuffle` optionally shuffle the globbed file list
2424
* `-image` if you have AUDIO files, you should normally set an image to display, as most/all streaming sites REQUIRE a video feed--even a static image.
@@ -29,15 +29,15 @@ python -m pylivestream.glob path site -glob glob_pattern
2929
Example: all AVI videos in directory `~/Videos`:
3030

3131
```sh
32-
python -m pylivestream.glob ~/Videos youtube -glob "*.avi"
32+
python -m pylivestream.fglob ~/Videos youtube -glob "*.avi"
3333
```
3434

3535
## stream endlessly looping videos
3636

3737
Example: all AVI videos in `~/Videos` are endlessly looped:
3838

3939
```sh
40-
python -m pylivestream.glob ~/Videos youtube -glob "*.avi" -loop
40+
python -m pylivestream.fglob ~/Videos youtube -glob "*.avi" -loop
4141
```
4242

4343
## stream m3u8 playlist
@@ -49,7 +49,7 @@ m3u8 playlist [example](./Examples/playlist_m3u8.py)
4949
Glob list of video files to stream. Suggest including a static -image (could be your logo):
5050

5151
```sh
52-
python -m pylivestream.glob path site -glob glob_pattern -image image
52+
python -m pylivestream.fglob path site -glob glob_pattern -image image
5353
```
5454

5555
* `path` path to where video files are
@@ -59,17 +59,17 @@ python -m pylivestream.glob path site -glob glob_pattern -image image
5959
Example: stream all .mp3 audio under `~/music` directory:
6060

6161
```sh
62-
python -m pylivestream.glob ~/music youtube -glob "*.mp3" -image mylogo.jpg
62+
python -m pylivestream.fglob ~/music youtube -glob "*.mp3" -image mylogo.jpg
6363
```
6464

6565
Example: stream all .mp3 audio in `~/music` with an animated GIF or video clip repeating:
6666

6767
```sh
68-
python -m pylivestream.glob ~/music youtube -glob "*.mp3" -image myclip.avi
68+
python -m pylivestream.fglob ~/music youtube -glob "*.mp3" -image myclip.avi
6969
```
7070

7171
or
7272

7373
```sh
74-
python -m pylivestream.glob ~/music youtube -glob "*.mp3" -image animated.gif
74+
python -m pylivestream.fglob ~/music youtube -glob "*.mp3" -image animated.gif
7575
```

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ There are two ways to start a stream (assuming you've configured as per followin
132132
Both do the same thing.
133133

134134
* command line
135-
* python -m pylivestream.glob
135+
* python -m pylivestream.fglob
136136
* python -m pylivestream.screen
137137
* python -m pylivestream.loopfile
138138
* python -m pylivestream.screen2disk

archive/visual_tests.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def main():
4545
[
4646
sys.executable,
4747
"-m",
48-
"pylivestream.glob",
48+
"pylivestream.fglob",
4949
"-y",
5050
"-image",
5151
str(fn),
@@ -57,11 +57,11 @@ def main():
5757

5858
print("1990s vector graphics with orchestra music (NO caption")
5959
subprocess.check_call(
60-
[sys.executable, "-m", "pylivestream.glob", "-y", "-image", str(MOVING), str(MUSIC), HOST]
60+
[sys.executable, "-m", "pylivestream.fglob", "-y", "-image", str(MOVING), str(MUSIC), HOST]
6161
)
6262
# video
6363
print("Looping video")
64-
subprocess.check_call([sys.executable, "-m", "pylivestream.glob", "-y", str(VIDEO), HOST])
64+
subprocess.check_call([sys.executable, "-m", "pylivestream.fglob", "-y", str(VIDEO), HOST])
6565
# %% Screenshare
6666
print("Screenshare + microphone")
6767
subprocess.check_call([sys.executable, "-m", "pylivestream.screen", "-y", HOST])

src/pylivestream/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
from .utils import meta_caption
22
from .base import FileIn, Microphone, SaveDisk, Screenshare, Camera, Livestream
33

4-
__version__ = "2.0.1"
4+
__version__ = "2.1.0"

src/pylivestream/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from pathlib import Path
1414

1515
from .base import FileIn, Microphone, SaveDisk, Camera
16-
from .glob import stream_files
16+
from .fglob import stream_files
1717
from .screen import stream_screen
1818

1919
__all__ = [
File renamed without changes.

src/pylivestream/tests/test_filein.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def test_script():
7474
[
7575
sys.executable,
7676
"-m",
77-
"pylivestream.glob",
77+
"pylivestream.fglob",
7878
str(fn),
7979
"localhost",
8080
str(ini),

0 commit comments

Comments
 (0)