update setup.py and README.rst

This commit is contained in:
Mike Fährmann
2017-10-27 15:45:38 +02:00
parent 707b15b586
commit a4bc5a3491
2 changed files with 12 additions and 15 deletions

View File

@@ -4,8 +4,9 @@ gallery-dl
*gallery-dl* is a command-line program to download image-galleries and *gallery-dl* is a command-line program to download image-galleries and
-collections from several image hosting sites such as pixiv.net, exhentai.org, -collections from several image hosting sites such as pixiv.net, exhentai.org,
gelbooru.com and several more (see `Supported Sites`_). It requires Python 3.3+ danbooru.donmai.us and several more (see `Supported Sites`_).
to run and works on Unix-like systems as well as on Windows. It requires Python 3.3+ to run and works on Unix-like systems as well as on
Windows.
|pypi| |build| |pypi| |build|
@@ -20,14 +21,14 @@ Installation via pip
-------------------- --------------------
The stable releases of *gallery-dl* are distributed on PyPI_ and can be The stable releases of *gallery-dl* are distributed on PyPI_ and can be
easily installed or upgraded to the latest version using pip_: easily installed or upgraded using pip_:
.. code:: bash .. code:: bash
$ pip install --upgrade gallery-dl $ pip install --upgrade gallery-dl
Installing the latest dev-version directly from GitHub can be done via Installing the latest dev-version directly from GitHub can be done with
pip as well: pip_ as well:
.. code:: bash .. code:: bash
@@ -83,11 +84,11 @@ See also :code:`gallery-dl --help`.
Examples Examples
-------- --------
Download images; in this case from gelbooru via tag search for 'bonocho': Download images; in this case from danbooru via tag search for 'bonocho':
.. code:: bash .. code:: bash
$ gallery-dl "http://gelbooru.com/index.php?page=post&s=list&tags=bonocho" $ gallery-dl http://danbooru.donmai.us/posts?tags=bonocho
Get the direct URL of an image from a site that requires authentication: Get the direct URL of an image from a site that requires authentication:
@@ -159,7 +160,7 @@ Username & Password
Some extractors require you to provide valid login-credentials in the form of Some extractors require you to provide valid login-credentials in the form of
a username & password pair. a username & password pair.
This is necessary for ``pixiv``, ``nijie`` and ``seiga`` and optional This is necessary for ``pixiv``, ``nijie`` and ``seiga`` and optional
(but strongly recommended) for ``exhentai`` and ``batoto``. (but strongly recommended) for ``exhentai``, ``batoto`` and ``sankaku``.
You can set the necessary information in your configuration file You can set the necessary information in your configuration file
(cf. gallery-dl.conf_) (cf. gallery-dl.conf_)

View File

@@ -21,8 +21,7 @@ def read(fname):
exec(read("gallery_dl/version.py")) exec(read("gallery_dl/version.py"))
DESCRIPTION = ("Command-line program to download image galleries and " DESCRIPTION = ("Command-line program to download image galleries and "
"collections from pixiv, exhentai, danbooru, gelbooru, nijie " "collections from pixiv, exhentai, danbooru and more")
"and more")
LONG_DESCRIPTION = read("README.rst") LONG_DESCRIPTION = read("README.rst")
if "py2exe" in sys.argv: if "py2exe" in sys.argv:
@@ -44,7 +43,7 @@ if "py2exe" in sys.argv:
"options": {"py2exe": { "options": {"py2exe": {
"bundle_files": 0, "bundle_files": 0,
"compressed": 1, "compressed": 1,
"optimize": 2, "optimize": 1,
"dist_dir": ".", "dist_dir": ".",
"packages": ["gallery_dl"], "packages": ["gallery_dl"],
"dll_excludes": ["w9xpopen.exe"], "dll_excludes": ["w9xpopen.exe"],
@@ -87,21 +86,18 @@ setup(
], ],
keywords="image gallery downloader crawler scraper", keywords="image gallery downloader crawler scraper",
classifiers=[ classifiers=[
"Development Status :: 3 - Alpha", "Development Status :: 5 - Production/Stable",
"Environment :: Console", "Environment :: Console",
"Intended Audience :: End Users/Desktop", "Intended Audience :: End Users/Desktop",
"License :: OSI Approved :: GNU General Public License v2 (GPLv2)", "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",
"Operating System :: Microsoft :: Windows", "Operating System :: Microsoft :: Windows",
"Operating System :: POSIX", "Operating System :: POSIX",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.3", "Programming Language :: Python :: 3.3",
"Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3 :: Only",
"Topic :: Internet",
"Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP",
"Topic :: Multimedia",
"Topic :: Multimedia :: Graphics", "Topic :: Multimedia :: Graphics",
], ],
test_suite="test", test_suite="test",