summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-23 13:53:29 +0200
committerGravatar RaNaN <Mast3rRaNaN@hotmail.de> 2011-10-23 13:53:29 +0200
commit2895b9908bbc59d1968e54998f929c980253e6c9 (patch)
tree9825aea24262c0c679a0400bbbfc469920eb909f
parentfix DepositfilesCom (#407) (diff)
downloadpyload-2895b9908bbc59d1968e54998f929c980253e6c9.tar.xz
updated setup script
-rw-r--r--.hgignore6
-rw-r--r--module/plugins/hooks/ExtractArchive.py5
-rw-r--r--pavement.py55
-rw-r--r--setup.cfg7
4 files changed, 59 insertions, 14 deletions
diff --git a/.hgignore b/.hgignore
index a49cc0b2b..1215b241d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,13 +19,10 @@ module/config/gui.xml
module/config/core.xml
module/config/plugin.xml
links.txt
-module/links.pkl
-module/cookies.txt
ssl.crt
ssl.key
cert.pem
module/web/pyload.db
-webserver.pid
*.svg
*.prefs
*.po
@@ -35,4 +32,5 @@ pyload/*
dist/*
build/*
setup.py
-paver-minilib.zip \ No newline at end of file
+paver-minilib.zip
+env/*
diff --git a/module/plugins/hooks/ExtractArchive.py b/module/plugins/hooks/ExtractArchive.py
index d48496c14..eaa68b834 100644
--- a/module/plugins/hooks/ExtractArchive.py
+++ b/module/plugins/hooks/ExtractArchive.py
@@ -140,6 +140,7 @@ class ExtractArchive(Hook):
#iterate packages -> plugins -> targets
for pid in ids:
p = self.core.files.getPackage(pid)
+ self.logInfo(_("Extract package %s") % p.name)
if not p: continue
# determine output folder
@@ -158,7 +159,7 @@ class ExtractArchive(Hook):
for plugin in self.plugins:
targets = plugin.getTargets(files_ids)
- self.logDebug("Targets: %s" % targets)
+ if targets: self.logDebug("Targets: %s" % targets)
for target, fid in targets:
if target in extracted:
self.logDebug(basename(target), "skipped")
@@ -327,7 +328,7 @@ class AbtractExtractor:
def __init__(self, m, file, out, fullpath, overwrite, renice):
- """Initialize extractor for specifiy file
+ """Initialize extractor for specific file
:param m: ExtractArchive Hook plugin
:param file: Absolute filepath
diff --git a/pavement.py b/pavement.py
index b7ece2bd4..b4914bd3e 100644
--- a/pavement.py
+++ b/pavement.py
@@ -22,8 +22,8 @@ if sys.version_info <= (2, 5):
setup(
name="pyload",
version="0.4.9",
- description='description',
- long_description='',
+ description='Fast, lightweight and full featured download manager.',
+ long_description=open(PROJECT_DIR / "README").read(),
keywords='',
url="http://pyload.org",
download_url='http://pyload.org/download',
@@ -47,12 +47,20 @@ setup(
#setup_requires=["setuptools_hg"],
entry_points={
'console_scripts': [
- 'pyLoadCore = pyLoadCore:main_func',
- 'pyLoadCli = pyLoadCli:some_func', ],
- 'gui_scripts': [
- 'pyLoadGui = my_package_gui.start_func',
- ]},
- zip_safe=False
+ 'pyLoadCore = pyLoadCore:main',
+ 'pyLoadCli = pyLoadCli:main'
+ ]},
+ zip_safe=False,
+ classifiers=[
+ "Development Status :: 5 - Production/Stable",
+ "Topic :: Internet",
+ "Topic :: Internet :: WWW/HTTP",
+ "Environment :: Console",
+ "Environment :: Web Environment",
+ "License :: OSI Approved :: GNU General Public License (GPL)",
+ "Operating System :: OS Independent",
+ "Programming Language :: Python :: 2"
+ ]
)
options(
@@ -68,6 +76,11 @@ options(
thrift=Bunch(
path="../thrift/trunk/compiler/cpp/thrift",
gen=""
+ ),
+ virtualenv=Bunch(
+ dir="env",
+ python="python2",
+ virtual="virtualenv2",
)
)
@@ -215,6 +228,32 @@ def generate_locale():
@task
+def virtualenv(options):
+ """Setup virtual environment"""
+ if path(options.dir).exists():
+ return
+
+ call([options.virtual, "--no-site-packages", "--python", options.python, options.dir])
+ print "$ source %s/bin/activate" % options.dir
+
+
+@task
+def clean_env():
+ """Deletes the virtual environment"""
+ env = path(options.virtualenv.dir)
+ if env.exists():
+ env.rmtree()
+
+
+@task
+@needs('generate_setup', 'minilib', 'get_source', 'virtualenv')
+def env_install():
+ """Install pyLoad into the virtualenv"""
+ venv = options.virtualenv
+ call([path(venv.dir) / "bin" / "easy_install", "."])
+
+
+@task
def clean():
"""Cleans build directories"""
path("build").rmtree()
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..51c054a75
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,7 @@
+[build_sphinx]
+source-dir = doc
+build-dir = doc/_build
+all_files = 1
+
+[upload_sphinx]
+upload-dir = doc/_build/html