diff -Nru guessit-0.7.1/debian/changelog guessit-0.8/debian/changelog --- guessit-0.7.1/debian/changelog 2014-03-29 20:29:31.000000000 +0000 +++ guessit-0.8/debian/changelog 2014-07-21 20:37:19.000000000 +0000 @@ -1,3 +1,10 @@ +guessit (0.8-1) unstable; urgency=medium + + * New upstream release + * python{3,}-requests added to Build-Depends + + -- Etienne Millon Mon, 21 Jul 2014 13:57:50 +0200 + guessit (0.7.1-1) unstable; urgency=low * Initial release. (Closes: #729870) diff -Nru guessit-0.7.1/debian/control guessit-0.8/debian/control --- guessit-0.7.1/debian/control 2014-03-28 19:01:15.000000000 +0000 +++ guessit-0.8/debian/control 2014-07-21 18:54:59.000000000 +0000 @@ -12,6 +12,7 @@ python-babelfish, python-nose, python-pkg-resources, + python-requests, python-setuptools, python-stevedore, python-yaml, @@ -19,6 +20,7 @@ python3-babelfish, python3-nose, python3-pkg-resources, + python3-requests, python3-setuptools, python3-stevedore, python3-yaml, diff -Nru guessit-0.7.1/docs/_build/html/api/guess.html guessit-0.8/docs/_build/html/api/guess.html --- guessit-0.7.1/docs/_build/html/api/guess.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/api/guess.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Guess — GuessIt 0.8.dev0 documentation + Guess — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -219,10 +219,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/api/matcher.html guessit-0.8/docs/_build/html/api/matcher.html --- guessit-0.7.1/docs/_build/html/api/matcher.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/api/matcher.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Matchers — GuessIt 0.8.dev0 documentation + Matchers — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -45,7 +45,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -58,19 +58,18 @@

    Matchers

    -class guessit.matcher.IterativeMatcher(filename, filetype=u'autodetect', opts=None, transfo_opts=None)
    +class guessit.matcher.IterativeMatcher(filename, options=None, **kwargs)

    An iterative matcher tries to match different patterns that appear in the filename.

    The filetype argument indicates which type of file you want to match. -If it is 'autodetect', the matcher will try to see whether it can guess +If it is undefined, the matcher will try to see whether it can guess that the file corresponds to an episode, or otherwise will assume it is a movie.

    The recognized filetype values are: -['autodetect', 'subtitle', 'info', 'movie', 'moviesubtitle', 'movieinfo', 'episode', +['subtitle', 'info', 'movie', 'moviesubtitle', 'movieinfo', 'episode', 'episodesubtitle', 'episodeinfo']

    -

    opts is a list of option names, that act as global flags for the matcher

    -

    transfo_opts is a dict of args to be passed to the transformations used -by the matcher. Its schema is: { transfo_name: (transfo_args, transfo_kwargs) }

    +

    options is a dict of options values to be passed to the transformations used +by the matcher.

    The IterativeMatcher works mainly in 2 steps:

    First, it splits the filename into a match_tree, which is a tree of groups which have a semantic meaning, such as episode number, movie title, @@ -137,10 +136,7 @@

    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/api/matchtree.html guessit-0.8/docs/_build/html/api/matchtree.html --- guessit-0.7.1/docs/_build/html/api/matchtree.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/api/matchtree.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - MatchTree — GuessIt 0.8.dev0 documentation + MatchTree — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -62,7 +62,7 @@

    MatchTree

    -class guessit.matchtree.BaseMatchTree(string=u'', span=None, parent=None)
    +class guessit.matchtree.BaseMatchTree(string='', span=None, parent=None)

    A BaseMatchTree is a tree covering the filename, where each node represents a substring in the filename and can have a Guess associated with it that contains the information that has been guessed @@ -84,10 +84,10 @@ >>> print(guessit.IterativeMatcher(path).match_tree) 000000 1111111111111111 2222222222222222222222222222222222222222222 333 000000 0000000000111111 0000000000111111222222222222222222222222222 000 - 011112 011112000000000000000000000000111 - 000000000000000000011112 - 0000000000111122222 - 0000111112 01112 + 011112 011112000011111222222222222222222 000 + 011112222222222222 + 0000011112222 + 01112 0111 Movies/__________(____)/Dark.City.(____).DC._____.____.___.____-___.___ tttttttttt yyyy yyyy fffff ssss aaa vvvv rrr ccc Movies/Dark City (1998)/Dark.City.(1998).DC.BDRip.720p.DTS.X264-CHD.mkv @@ -100,7 +100,7 @@ groups which could not be identified.

    The lines before that indicate the indices of the groups in the tree.

    For instance, the part of the filename ‘BDRip’ is the leaf with index -(2, 2, 0, 0, 0, 1) (read from top to bottom), and its meaning is ‘format’ +(2, 2, 1) (read from top to bottom), and its meaning is ‘format’ (as shown by the f‘s on the last-but-one line).

    @@ -146,7 +146,19 @@
    leaves()
    -

    Return a list of all the nodes that are leaves.

    +

    Return a generator over all the nodes that are leaves.

    +
    + +
    +
    +next_leaf(leaf)
    +

    Return next leaf for this node

    +
    + +
    +
    +next_leaves(leaf)
    +

    Return next leaves for this node

    @@ -182,6 +194,18 @@ relative to this node.

    +
    +
    +previous_leaf(leaf)
    +

    Return previous leaf for this node

    +
    + +
    +
    +previous_leaves(leaf)
    +

    Return previous leaves for this node

    +
    +
    root
    @@ -214,7 +238,7 @@
    -class guessit.matchtree.MatchTree(string=u'', span=None, parent=None)
    +class guessit.matchtree.MatchTree(string='', span=None, parent=None)

    The MatchTree contains a few “utility” methods which are not necessary for the BaseMatchTree, but add a lot of convenience for writing higher-level rules.

    @@ -234,7 +258,7 @@
    leaves_containing(property_name)
    -

    Return a list of leaves that guessed the given property.

    +

    Return a generator of leaves that guessed the given property.

    @@ -247,21 +271,21 @@
    previous_leaves_containing(node, property_name)
    -

    Return a list of leaves containing the given property that are +

    Return a generator of leaves containing the given property that are before the given node (in the string).

    previous_unidentified_leaves(node)
    -

    Return a list of non-empty leaves that are before the given +

    Return a generator of non-empty leaves that are before the given node (in the string).

    -unidentified_leaves(valid=<function <lambda> at 0x10c2aaa28>)
    -

    Return a list of leaves that are not empty.

    +unidentified_leaves(valid=<function MatchTree.<lambda> at 0x110744268>) +

    Return a generator of leaves that are not empty.

    @@ -311,10 +335,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/dev/internals.html guessit-0.8/docs/_build/html/dev/internals.html --- guessit-0.7.1/docs/_build/html/dev/internals.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/dev/internals.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Understanding the MatchTree — GuessIt 0.8.dev0 documentation + Understanding the MatchTree — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -258,10 +258,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/genindex.html guessit-0.8/docs/_build/html/genindex.html --- guessit-0.7.1/docs/_build/html/genindex.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/genindex.html 2014-06-03 22:06:34.000000000 +0000 @@ -7,7 +7,7 @@ - Index — GuessIt 0.8.dev0 documentation + Index — GuessIt 0.7.2.dev0 documentation @@ -15,7 +15,7 @@ - + @@ -42,7 +42,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -232,6 +232,14 @@ + -
    +
    next_leaf() (guessit.matchtree.BaseMatchTree method) +
    + + +
    next_leaves() (guessit.matchtree.BaseMatchTree method) +
    + +
    nice_string() (guessit.guess.Guess method)
    @@ -239,12 +247,12 @@
    node_at() (guessit.matchtree.BaseMatchTree method)
    +
    node_idx (guessit.matchtree.BaseMatchTree attribute)
    -
    nodes() (guessit.matchtree.BaseMatchTree method)
    @@ -264,12 +272,20 @@ -
    previous_leaves_containing() (guessit.matchtree.MatchTree method) +
    previous_leaf() (guessit.matchtree.BaseMatchTree method) +
    + + +
    previous_leaves() (guessit.matchtree.BaseMatchTree method)
    +
    previous_leaves_containing() (guessit.matchtree.MatchTree method) +
    + +
    previous_unidentified_leaves() (guessit.matchtree.MatchTree method)
    @@ -370,10 +386,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/index.html guessit-0.8/docs/_build/html/index.html --- guessit-0.7.1/docs/_build/html/index.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/index.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - GuessIt — GuessIt 0.8.dev0 documentation + GuessIt — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -45,7 +45,7 @@
  • next |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -56,14 +56,14 @@

    GuessIt

    -

    Release v0.8.dev0 (Installation)

    +

    Release v0.7.2.dev0 (Installation)

    GuessIt is a python library that tries to extract as much information as possible from a video file.

    It has a powerful filename matcher that allows to guess a lot of metadata from a video using only its filename. This matcher works with both movies and tv shows episodes.

    For example, GuessIt can do the following:

    -
    $ python guessit.py "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi"
    +
    $ guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi"
     For: Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi
     GuessIt found: {
         [1.00] "mimetype": "video/x-msvideo",
    @@ -84,12 +84,15 @@
     

    At the moment, the filename matcher is able to recognize the following property types:

    [ title,                             # for movies and episodes
    -  series, season, episodeNumber,     # for episodes only
    +  series, season,                    # for episodes only
    +  episodeNumber, episodeDetails,     # for episodes only
       date, year,                        # 'date' instance of datetime.date
    -  language, subtitleLanguage,        # instances of guessit.Language
    -  country,                           # instances of guessit.Country
    +  language, subtitleLanguage,        # instances of babelfish.Language
    +  country,                           # instances of babelfish.Country
    +  fileSize, duration,                # when detecting video file metadata
       container, format,
       videoCodec, audioCodec,
    +  videoProfile, audioProfile,
       audioChannels, screenSize,
       releaseGroup, website,
       cdNumber, cdNumberTotal,
    @@ -104,8 +107,10 @@
     namely all the ones you can find in the hashlib python module (md5,
     sha1, ...), but also the Media Player Classic hash that is used (amongst
     others) by OpenSubtitles and SMPlayer, as well as the ed2k hash.

    -

    If you have the ‘guess-language’ python module installed, GuessIt can also +

    If you have the ‘guess-language’ python package installed, GuessIt can also analyze a subtitle file’s contents and detect which language it is written in.

    +

    If you have the ‘enzyme’ python package installed, GuessIt can also detect the +properties from the actual video file metadata.

    User Guide

    @@ -124,6 +129,13 @@
    +
    +

    Web Service API

    +

    The guessit.io server also provides a free webservice that allows you to perform +filename detection, even you don’t have python installed (eg: you need to use it +from an Android app, or NodeJS, etc.).

    +

    You can look at the documentation web API here: http://api.guessit.io

    +

    Developer Guide

    If you want to contribute to the project, this part of the documentation is for @@ -156,6 +168,10 @@ There you will also find the User guide and Developer documentation.

    This project is hosted on GitHub: https://github.com/wackou/guessit

    Please report issues and/or feature requests via the bug tracker.

    +

    You can also report issues using the command-line tool:

    +
    $ guessit --bug "filename.that.fails.avi"
    +
    +

    Contribute

    @@ -187,14 +203,29 @@

    +

    + allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px">

    - - Build status + + Build status + + + + License + +

    + +

    + + Travis-CI + + + + Code coverage

    @@ -206,24 +237,27 @@

    Useful Links

    Donate

    -If you like GuessIt, please consider making a donation in bitcoins or in litecoins. +

    +If you like GuessIt, please consider making a donation in +bitcoins or in +litecoins. +

    - + -

    - + @@ -41,7 +41,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -56,7 +56,7 @@ metadata from a video using only its filename. This matcher works with both movies and tv shows episodes.

    For example, GuessIt can do the following:

    -
    $ python guessit.py "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi"
    +
    $ guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi"
     For: Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi
     GuessIt found: {
         [1.00] "mimetype": "video/x-msvideo",
    @@ -77,12 +77,15 @@
     

    At the moment, the filename matcher is able to recognize the following property types:

    [ title,                             # for movies and episodes
    -  series, season, episodeNumber,     # for episodes only
    +  series, season,                    # for episodes only
    +  episodeNumber, episodeDetails,     # for episodes only
       date, year,                        # 'date' instance of datetime.date
    -  language, subtitleLanguage,        # instances of guessit.Language
    -  country,                           # instances of guessit.Country
    +  language, subtitleLanguage,        # instances of babelfish.Language
    +  country,                           # instances of babelfish.Country
    +  fileSize, duration,                # when detecting video file metadata
       container, format,
       videoCodec, audioCodec,
    +  videoProfile, audioProfile,
       audioChannels, screenSize,
       releaseGroup, website,
       cdNumber, cdNumberTotal,
    @@ -97,8 +100,10 @@
     namely all the ones you can find in the hashlib python module (md5,
     sha1, ...), but also the Media Player Classic hash that is used (amongst
     others) by OpenSubtitles and SMPlayer, as well as the ed2k hash.

    -

    If you have the ‘guess-language’ python module installed, GuessIt can also +

    If you have the ‘guess-language’ python package installed, GuessIt can also analyze a subtitle file’s contents and detect which language it is written in.

    +

    If you have the ‘enzyme’ python package installed, GuessIt can also detect the +properties from the actual video file metadata.

    @@ -142,10 +147,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/projectinfo.html guessit-0.8/docs/_build/html/projectinfo.html --- guessit-0.7.1/docs/_build/html/projectinfo.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/projectinfo.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Support — GuessIt 0.8.dev0 documentation + Support — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -56,6 +56,10 @@ There you will also find the User guide and Developer documentation.

    This project is hosted on GitHub: https://github.com/wackou/guessit

    Please report issues and/or feature requests via the bug tracker.

    +

    You can also report issues using the command-line tool:

    +
    $ guessit --bug "filename.that.fails.avi"
    +
    +

    Contribute

    @@ -123,10 +127,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/py-modindex.html guessit-0.8/docs/_build/html/py-modindex.html --- guessit-0.7.1/docs/_build/html/py-modindex.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/py-modindex.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Python Module Index — GuessIt 0.8.dev0 documentation + Python Module Index — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -44,7 +44,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -128,10 +128,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/search.html guessit-0.8/docs/_build/html/search.html --- guessit-0.7.1/docs/_build/html/search.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/search.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Search — GuessIt 0.8.dev0 documentation + Search — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -109,10 +109,7 @@
    - - Fork me on GitHub - \ No newline at end of file Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_build/html/_static/coinwidget/icon_bitcoin.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_build/html/_static/coinwidget/icon_bitcoin.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_build/html/_static/coinwidget/icon_litecoin.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_build/html/_static/coinwidget/icon_litecoin.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_build/html/_static/coinwidget/icon_qrcode.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_build/html/_static/coinwidget/icon_qrcode.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_build/html/_static/coinwidget/icon_wallet.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_build/html/_static/coinwidget/icon_wallet.png differ diff -Nru guessit-0.7.1/docs/_build/html/_themes/README.html guessit-0.8/docs/_build/html/_themes/README.html --- guessit-0.7.1/docs/_build/html/_themes/README.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/_themes/README.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - krTheme Sphinx Style — GuessIt 0.8.dev0 documentation + krTheme Sphinx Style — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • modules |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -118,10 +118,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/user/commandline.html guessit-0.8/docs/_build/html/user/commandline.html --- guessit-0.7.1/docs/_build/html/user/commandline.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/user/commandline.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Command-line usage — GuessIt 0.8.dev0 documentation + Command-line usage — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -81,13 +81,16 @@ the videoCodec is h264, but only 60% confident that the title is ‘Dark City’.

    You can use the -v or --verbose flag to have it display debug information.

    -

    You can use the -p or -v flags to display the properties names or the +

    You can use the -p or -l flags to display the properties names or the multiple values they can take.

    You can also run a --demo mode which will run a few tests and display the results.

    By default, GuessIt will try to autodetect the type of file you are asking it to guess, movie or episode. If you want to force one of those, use the -t movie or -t episode flags.

    +

    If input file is remote file or a release name with no folder and extension, +you should use the -n or --name-only flag. It will disable folder and extension +parsing, and any concrete file related analysis.

    Guessit also allows you to specify the type of information you want using the -i or --info flag:

    $ guessit -i hash_md5,hash_sha1,hash_ed2k tests/dummy.srt
    @@ -105,18 +108,24 @@
     
     Options:
       -h, --help            show this help message and exit
    -  -v, --verbose         display debug output
    +  -v, --verbose         Display debug output
       -p, --properties      Display properties that can be guessed.
       -l, --values          Display property values that can be guessed.
    -  -i INFO, --info=INFO  the desired information type: filename, hash_mpc or a
    -                        hash from python's hashlib module, such as hash_md5,
    -                        hash_sha1, ...; or a list of any of them, comma-
    -                        separated
    -  -t FILETYPE, --type=FILETYPE
    -                        the suggested file type: movie, episode or autodetect
    -  -a, --advanced        display advanced information for filename guesses, as
    +  -s, --transformers    Display transformers that can be used.
    +  -i INFO, --info=INFO  The desired information type: filename, video,
    +                        hash_mpc or a hash from python's hashlib module, such
    +                        as hash_md5, hash_sha1, ...; or a list of any of them,
    +                        comma-separated
    +  -n, --name-only       Parse files as name only. Disable folder parsing,
    +                        extension parsing, and file content analysis.
    +  -t TYPE, --type=TYPE  The suggested file type: movie, episode. If undefined,
    +                        type will be guessed.
    +  -a, --advanced        Display advanced information for filename guesses, as
                             json output
    -  -d, --demo            run a few builtin tests instead of analyzing a file
    +  -y, --yaml            Display information for filename guesses as yaml
    +                        output (like unit-test)
    +  -d, --demo            Run a few builtin tests instead of analyzing a file
    +  -b, --bug             Submit a wrong detection to the guessit.io service
     
    @@ -164,10 +173,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/user/install.html guessit-0.8/docs/_build/html/user/install.html --- guessit-0.7.1/docs/_build/html/user/install.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/user/install.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Installation — GuessIt 0.8.dev0 documentation + Installation — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -150,10 +150,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/_build/html/user/python.html guessit-0.8/docs/_build/html/user/python.html --- guessit-0.7.1/docs/_build/html/user/python.html 2014-02-05 21:47:34.000000000 +0000 +++ guessit-0.8/docs/_build/html/user/python.html 2014-06-03 22:06:34.000000000 +0000 @@ -6,7 +6,7 @@ - Python module usage — GuessIt 0.8.dev0 documentation + Python module usage — GuessIt 0.7.2.dev0 documentation @@ -14,7 +14,7 @@ - + @@ -49,7 +49,7 @@
  • previous |
  • -
  • GuessIt 0.8.dev0 documentation »
  • +
  • GuessIt 0.7.2.dev0 documentation »
  • @@ -99,6 +99,9 @@ for each of the properties it has.

    A Guess instance is also a python dict instance, so you can use it wherever you would use a normal python dict.

    +

    If you have the Enzyme python package installed, then the +guess_video_metadata function is also available, which will return a guess +with the properties from the video file metadata.

    @@ -144,10 +147,7 @@
    - - Fork me on GitHub - \ No newline at end of file diff -Nru guessit-0.7.1/docs/conf.py guessit-0.8/docs/conf.py --- guessit-0.7.1/docs/conf.py 2013-11-18 19:41:28.000000000 +0000 +++ guessit-0.8/docs/conf.py 2014-06-03 21:06:01.000000000 +0000 @@ -42,7 +42,7 @@ # General information about the project. project = u'GuessIt' -copyright = u'2013 Nicolas Wack' +copyright = u'2014 Nicolas Wack' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -189,7 +189,7 @@ # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ ('index', 'GuessIt.tex', u'GuessIt Documentation', - u'Nicolas Wack, Ricard Marxer', 'manual'), + u'Nicolas Wack', 'manual'), ] # The name of an image file (relative to this directory) to place at the top of @@ -219,7 +219,7 @@ # (source start file, name, description, authors, manual section). man_pages = [ ('index', 'guessit', u'GuessIt Documentation', - [u'Nicolas Wack, Ricard Marxer'], 1) + [u'Nicolas Wack'], 1) ] # If true, show URL addresses after external links. @@ -233,7 +233,7 @@ # dir menu entry, description, category) texinfo_documents = [ ('index', 'GuessIt', u'GuessIt Documentation', - u'Nicolas Wack, Ricard Marxer', 'GuessIt', 'One line description of project.', + u'Nicolas Wack', 'GuessIt', 'One line description of project.', 'Miscellaneous'), ] diff -Nru guessit-0.7.1/docs/index.rst guessit-0.8/docs/index.rst --- guessit-0.7.1/docs/index.rst 2013-11-09 17:53:02.000000000 +0000 +++ guessit-0.8/docs/index.rst 2014-06-03 22:07:43.000000000 +0000 @@ -21,6 +21,16 @@ user/python +Web Service API +--------------- + +The guessit.io server also provides a free webservice that allows you to perform +filename detection, even you don't have python installed (eg: you need to use it +from an Android app, or NodeJS, etc.). + +You can look at the documentation for the web API here: ``_ + + Developer Guide --------------- diff -Nru guessit-0.7.1/docs/presentation.rst guessit-0.8/docs/presentation.rst --- guessit-0.7.1/docs/presentation.rst 2013-11-09 17:53:02.000000000 +0000 +++ guessit-0.8/docs/presentation.rst 2014-05-31 10:03:20.000000000 +0000 @@ -8,7 +8,7 @@ For example, GuessIt can do the following:: - $ python guessit.py "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi" + $ guessit "Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi" For: Treme.1x03.Right.Place,.Wrong.Time.HDTV.XviD-NoTV.avi GuessIt found: { [1.00] "mimetype": "video/x-msvideo", @@ -32,12 +32,15 @@ property types:: [ title, # for movies and episodes - series, season, episodeNumber, # for episodes only + series, season, # for episodes only + episodeNumber, episodeDetails, # for episodes only date, year, # 'date' instance of datetime.date - language, subtitleLanguage, # instances of guessit.Language - country, # instances of guessit.Country + language, subtitleLanguage, # instances of babelfish.Language + country, # instances of babelfish.Country + fileSize, duration, # when detecting video file metadata container, format, videoCodec, audioCodec, + videoProfile, audioProfile, audioChannels, screenSize, releaseGroup, website, cdNumber, cdNumberTotal, @@ -53,5 +56,8 @@ sha1, ...), but also the Media Player Classic hash that is used (amongst others) by OpenSubtitles and SMPlayer, as well as the ed2k hash. -If you have the 'guess-language' python module installed, GuessIt can also +If you have the 'guess-language' python package installed, GuessIt can also analyze a subtitle file's contents and detect which language it is written in. + +If you have the 'enzyme' python package installed, GuessIt can also detect the +properties from the actual video file metadata. diff -Nru guessit-0.7.1/docs/projectinfo.rst guessit-0.8/docs/projectinfo.rst --- guessit-0.7.1/docs/projectinfo.rst 2013-11-10 03:07:30.000000000 +0000 +++ guessit-0.8/docs/projectinfo.rst 2014-05-16 22:51:19.000000000 +0000 @@ -9,6 +9,10 @@ Please report issues and/or feature requests via the `bug tracker `_. +You can also report issues using the command-line tool:: + + $ guessit --bug "filename.that.fails.avi" + Contribute ---------- Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_static/coinwidget/icon_bitcoin.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_static/coinwidget/icon_bitcoin.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_static/coinwidget/icon_litecoin.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_static/coinwidget/icon_litecoin.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_static/coinwidget/icon_qrcode.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_static/coinwidget/icon_qrcode.png differ Binary files /tmp/OfpFDx5c0u/guessit-0.7.1/docs/_static/coinwidget/icon_wallet.png and /tmp/tOC8DjlpI2/guessit-0.8/docs/_static/coinwidget/icon_wallet.png differ diff -Nru guessit-0.7.1/docs/_templates/sidebarintro.html guessit-0.8/docs/_templates/sidebarintro.html --- guessit-0.7.1/docs/_templates/sidebarintro.html 2014-01-21 20:24:46.000000000 +0000 +++ guessit-0.8/docs/_templates/sidebarintro.html 2014-06-03 21:03:52.000000000 +0000 @@ -4,14 +4,29 @@

    +

    + allowtransparency="true" frameborder="0" scrolling="0" width="200px" height="35px">

    - - Build status + + Build status + + + + License + +

    + +

    + + Travis-CI + + + + Code coverage

    @@ -23,24 +38,27 @@

    Useful Links

    Donate

    -If you like GuessIt, please consider making a donation in bitcoins or in litecoins. +

    +If you like GuessIt, please consider making a donation in +bitcoins or in +litecoins. +

    - + -