Permalink
Browse files

Merge branch 'developpement'

  • Loading branch information...
2 parents 8f18657 + f0a5de2 commit 52dbfe61128ccf965d67952ad01caff7e18c4750 @metal3d committed Mar 17, 2012
Showing with 6 additions and 13 deletions.
  1. +2 −2 README.rst
  2. +2 −2 setup.py
  3. +1 −3 src/cquvi.pxd
  4. +1 −6 src/quvi.pyx
View
@@ -43,7 +43,7 @@ After having compiled quvi, you can use it as a python module. Module defines a
#instance:
q = quvi.Quvi()
q.parse("http://a.youtube.url")
- print q.getproperties()
+ print q.get_properties()
You will see a dict definition that have severals information given by libquvi.
@@ -56,7 +56,7 @@ It's possible to use ``multiprocessing`` module or ``threads`` module to handle
def getInfo(url):
q = quvi.Quvi()
q.parse(url)
- print q.getproperties()
+ print q.get_properties()
#urls to parse
url = "http://www.youtube.com/watch?v=..."
View
@@ -11,13 +11,13 @@
url="https://github.com/metal3d/python-libquvi",
description="libquvi wrapper module",
license="LGPLv2.1+",
- version="0.0.1-a3",
+ version="0.0.1-b1",
cmdclass = {'build_ext': build_ext},
ext_modules = ext_modules,
long_description = "".join(open('README.rst').readlines()),
classifiers=[
- 'Development Status :: 3 - Alpha',
+ 'Development Status :: 4 - Beta',
'Intended Audience :: Developers',
'License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)',
'Operating System :: POSIX :: Linux',
View
@@ -16,8 +16,7 @@ cdef extern from "quvi/quvi.h":
ctypedef void* quvi_callback_status
ctypedef enum QUVIversion:
QUVI_VERSION
- #QUVI_VERSION_LONG
- #QUVI_VERSION_SCRIPTS
+
ctypedef enum QUVIcode:
QUVI_OK = 0x00
QUVI_MEM
@@ -90,7 +89,6 @@ cdef extern from "quvi/quvi.h":
QUVI_IDENT_PROPERTY_URL
QUVI_IDENT_PROPERTY_DOMAIN
QUVI_IDENT_PROPERTY_FORMATS
- #QUVI_IDENT_PROPERTY_CATEGORIES
ctypedef int quvi_word
ctypedef int quvi_byte
View
@@ -9,7 +9,7 @@ You can use this module to parse an url from youtube, dailymotion... like this:
>> print q.get_properties()
"""
-__author__="Patrice FERLET <metal3d@gmail.com>"
+__author__="Patrice FERLET <metal3d@gmail.com>", "Raphaël VINOT <raphael.vinot@gmail.com>"
__license__="LGPLv2.1+."
cimport cquvi
@@ -41,12 +41,7 @@ cdef class Quvi:
def get_version(self):
"""Get the version(s), only QUVI_VERSION is known by the C library"""
- #print cquvi.quvi_version(cquvi.QUVI_VERSION)
- #print cquvi.quvi_version(cquvi.QUVI_VERSIONLONG)
- #print cquvi.quvi_version(cquvi.QUVI_SCRIPTS)
version = cquvi.quvi_version(cquvi.QUVI_VERSION)
- #version_long = cquvi.quvi_version(cquvi.QUVI_VERSIONLONG)
- #scripts = cquvi.quvi_version(cquvi.QUVI_SCRIPTS)
return version
def get_supported_ident_properties(self, char* url):

0 comments on commit 52dbfe6

Please sign in to comment.