Skip to content

Commit

Permalink
Merge branch 'developpement'
Browse files Browse the repository at this point in the history
  • Loading branch information
metal3d committed Mar 17, 2012
2 parents 8f18657 + f0a5de2 commit 52dbfe6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 13 deletions.
4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand All @@ -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=..."
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 1 addition & 3 deletions src/cquvi.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 1 addition & 6 deletions src/quvi.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 52dbfe6

Please sign in to comment.