Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a6ceedc

Browse files
cdragecdrage
committed
Rename instances of "livestreamer" to "streamlink"
Renames all instances of "livestreamer" to "streamlink".
1 parent 88231ed commit a6ceedc

164 files changed

Lines changed: 487 additions & 487 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/conf.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import os
55
import sys
66

7-
from livestreamer import __version__ as livestreamer_version
7+
from streamlink import __version__ as streamlink_version
88

99
# If extensions (or modules to document with autodoc) are in another directory,
1010
# add these directories to sys.path here. If the directory is relative to the
@@ -33,7 +33,7 @@
3333
master_doc = 'index'
3434

3535
# General information about the project.
36-
project = 'Livestreamer'
36+
project = 'Streamlink'
3737
copyright = '2011-2015, Christopher Rosell'
3838

3939
# The version info for the project you're documenting, acts as replacement for
@@ -42,9 +42,9 @@
4242

4343
#
4444
# The short X.Y version.
45-
version = livestreamer_version
45+
version = streamlink_version
4646
# The full version, including alpha/beta/rc tags.
47-
release = livestreamer_version
47+
release = streamlink_version
4848

4949
# The language for content autogenerated by Sphinx. Refer to documentation
5050
# for a list of supported languages.
@@ -80,7 +80,7 @@
8080
# A list of ignored prefixes for module index sorting.
8181
#modindex_common_prefix = []
8282

83-
github_project = 'chrippa/livestreamer'
83+
github_project = 'streamlink/streamlink'
8484

8585
# -- Options for HTML output ---------------------------------------------------
8686

@@ -93,8 +93,8 @@
9393
"Command-line utility that extracts streams from various services "
9494
"and pipes them into a video player of choice."
9595
),
96-
"github_user": "chrippa",
97-
"github_repo": "livestreamer",
96+
"github_user": "streamlink",
97+
"github_repo": "streamlink",
9898
"sticky_navigation": True
9999
}
100100

@@ -105,7 +105,7 @@
105105
# Theme options are theme-specific and customize the look and feel of a theme
106106
# further. For a list of options available for each theme, see the
107107
# documentation.
108-
# html_theme_options = { "github_fork": "chrippa/livestreamer" }
108+
# html_theme_options = { "github_fork": "streamlink/streamlink" }
109109

110110
# Add any paths that contain custom themes here, relative to this directory.
111111
#html_theme_path = []
@@ -179,14 +179,14 @@
179179
#html_file_suffix = None
180180

181181
# Output file base name for HTML help builder.
182-
htmlhelp_basename = 'livestreamerdoc'
182+
htmlhelp_basename = 'streamlinkdoc'
183183

184184
# -- Options for manual page output --------------------------------------------
185185

186186
# One entry per manual page. List of tuples
187187
# (source start file, name, description, authors, manual section).
188188
man_pages = [
189-
('cli', 'livestreamer', 'extracts streams from various services and pipes them into a video player of choice', ['Christopher Rosell'], 1)
189+
('cli', 'streamlink', 'extracts streams from various services and pipes them into a video player of choice', ['Christopher Rosell'], 1)
190190
]
191191

192192
# If true, show URL addresses after external links.

‎examples/gst-player.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
import gi
88

99
from gi.repository import GObject as gobject, Gst as gst
10-
from livestreamer import Livestreamer, StreamError, PluginError, NoPluginError
10+
from streamlink import Streamlink, StreamError, PluginError, NoPluginError
1111

1212

1313
def exit(msg):
1414
print(msg, file=sys.stderr)
1515
sys.exit()
1616

1717

18-
class LivestreamerPlayer(object):
18+
class StreamlinkPlayer(object):
1919
def __init__(self):
2020
self.fd = None
2121
self.mainloop = gobject.MainLoop()
@@ -104,18 +104,18 @@ def main():
104104
url = sys.argv[1]
105105
quality = sys.argv[2]
106106

107-
# Create the Livestreamer session
108-
livestreamer = Livestreamer()
107+
# Create the Streamlink session
108+
streamlink = Streamlink()
109109

110110
# Enable logging
111-
livestreamer.set_loglevel("info")
112-
livestreamer.set_logoutput(sys.stdout)
111+
streamlink.set_loglevel("info")
112+
streamlink.set_logoutput(sys.stdout)
113113

114114
# Attempt to fetch streams
115115
try:
116-
streams = livestreamer.streams(url)
116+
streams = streamlink.streams(url)
117117
except NoPluginError:
118-
exit("Livestreamer is unable to handle the URL '{0}'".format(url))
118+
exit("Streamlink is unable to handle the URL '{0}'".format(url))
119119
except PluginError as err:
120120
exit("Plugin error: {0}".format(err))
121121

@@ -130,7 +130,7 @@ def main():
130130
stream = streams[quality]
131131

132132
# Create the player and start playback
133-
player = LivestreamerPlayer()
133+
player = StreamlinkPlayer()
134134

135135
# Blocks until playback is done
136136
player.play(stream)

‎setup.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77

88
deps = []
99
packages = [
10-
"livestreamer",
11-
"livestreamer.stream",
12-
"livestreamer.plugin",
13-
"livestreamer.plugin.api",
14-
"livestreamer.plugins",
15-
"livestreamer.packages",
16-
"livestreamer.packages.flashmedia",
17-
"livestreamer_cli",
18-
"livestreamer_cli.packages",
19-
"livestreamer_cli.utils"
10+
"streamlink",
11+
"streamlink.stream",
12+
"streamlink.plugin",
13+
"streamlink.plugin.api",
14+
"streamlink.plugins",
15+
"streamlink.packages",
16+
"streamlink.packages.flashmedia",
17+
"streamlink_cli",
18+
"streamlink_cli.packages",
19+
"streamlink_cli.utils"
2020
]
2121

2222
if version_info[0] == 2:
@@ -45,19 +45,19 @@
4545
srcdir = join(dirname(abspath(__file__)), "src/")
4646
sys_path.insert(0, srcdir)
4747

48-
setup(name="livestreamer",
48+
setup(name="streamlink",
4949
version="1.14.0-rc1",
50-
description="Livestreamer is command-line utility that extracts streams "
50+
description="Streamlink is command-line utility that extracts streams "
5151
"from various services and pipes them into a video player of "
5252
"choice.",
53-
url="http://livestreamer.io/",
53+
url="http://streamlink.io/",
5454
author="Christopher Rosell",
55-
author_email="chrippa@tanuki.se",
55+
author_email="streamlink@tanuki.se",
5656
license="Simplified BSD",
5757
packages=packages,
5858
package_dir={ "": "src" },
5959
entry_points={
60-
"console_scripts": ["livestreamer=livestreamer_cli.main:main"]
60+
"console_scripts": ["streamlink=streamlink_cli.main:main"]
6161
},
6262
install_requires=deps,
6363
test_suite="tests",

src/livestreamer/__init__.py renamed to src/streamlink/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# coding: utf8
2-
"""Livestreamer extracts streams from various services.
2+
"""Streamlink extracts streams from various services.
33
4-
The main compontent of Livestreamer is a command-line utility that
4+
The main compontent of Streamlink is a command-line utility that
55
launches the streams in a video player.
66
77
An API is also provided that allows direct access to stream data.
88
9-
Full documentation is available at http://docs.livestreamer.io/.
9+
Full documentation is available at http://docs.streamlink.io/.
1010
1111
"""
1212

1313

14-
__title__ = "livestreamer"
14+
__title__ = "streamlink"
1515
__version__ = "1.14.0-rc1"
1616
__license__ = "Simplified BSD"
1717
__author__ = "Christopher Rosell"
@@ -23,7 +23,7 @@
2323
"Athanasios Oikonomou (@athoik)",
2424
"Brian Callahan (@ibara)",
2525
"Che (@chhe)",
26-
"Christopher Rosell (@chrippa)",
26+
"Christopher Rosell (@streamlink)",
2727
"Daniel Meißner (@meise)",
2828
"Daniel Miranda (@danielkza)",
2929
"Daniel Wallace (@gtmanfred)",
@@ -71,6 +71,6 @@
7171
]
7272

7373
from .api import streams
74-
from .exceptions import (LivestreamerError, PluginError, NoStreamsError,
74+
from .exceptions import (StreamlinkError, PluginError, NoStreamsError,
7575
NoPluginError, StreamError)
76-
from .session import Livestreamer
76+
from .session import Streamlink

src/livestreamer/api.py renamed to src/streamlink/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from .session import Livestreamer
1+
from .session import Streamlink
22

33
def streams(url, **params):
44
"""Attempts to find a plugin and extract streams from the *url*.
@@ -8,5 +8,5 @@ def streams(url, **params):
88
Raises :exc:`NoPluginError` if no plugin is found.
99
"""
1010

11-
session = Livestreamer()
11+
session = Streamlink()
1212
return session.streams(url, **params)

src/livestreamer/buffers.py renamed to src/streamlink/buffers.py

File renamed without changes.

src/livestreamer/cache.py renamed to src/streamlink/cache.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
xdg_cache = os.environ.get("XDG_CACHE_HOME",
1414
os.path.expanduser("~/.cache"))
1515

16-
cache_dir = os.path.join(xdg_cache, "livestreamer")
16+
cache_dir = os.path.join(xdg_cache, "streamlink")
1717

1818

1919
class Cache(object):

src/livestreamer/compat.py renamed to src/streamlink/compat.py

File renamed without changes.

src/livestreamer/exceptions.py renamed to src/streamlink/exceptions.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
class LivestreamerError(Exception):
2-
"""Any error caused by Livestreamer will be caught
1+
class StreamlinkError(Exception):
2+
"""Any error caused by Streamlink will be caught
33
with this exception."""
44

55

6-
class PluginError(LivestreamerError):
6+
class PluginError(StreamlinkError):
77
"""Plugin related error."""
88

99

10-
class NoStreamsError(LivestreamerError):
10+
class NoStreamsError(StreamlinkError):
1111
def __init__(self, url):
1212
self.url = url
1313
err = "No streams found on this URL: {0}".format(url)
@@ -18,9 +18,9 @@ class NoPluginError(PluginError):
1818
"""No relevant plugin has been loaded."""
1919

2020

21-
class StreamError(LivestreamerError):
21+
class StreamError(StreamlinkError):
2222
"""Stream related error."""
2323

2424

25-
__all__ = ["LivestreamerError", "PluginError", "NoPluginError",
25+
__all__ = ["StreamlinkError", "PluginError", "NoPluginError",
2626
"NoStreamsError", "StreamError"]

src/livestreamer/logger.py renamed to src/streamlink/logger.py

File renamed without changes.

0 commit comments

Comments
 (0)