Merge branch 'master' of github.com:NFicano/pytube

CHANGES.rst

@@ -1,6 +1,75 @@
 Changelog
 =========
 
+0.3.1 (2015-09-05)
+------------------
+
+- Fix rst violations in readme. [Jose Diaz-Gonzalez]
+
+0.3.0 (2015-09-06)
+------------------
+
+- Changed print statement to logging. [João Ricardo]
+
+  This fixes this issue: https://github.com/nficano/pytube/issues/61
+
+- Bumped verison to 0.2.1. [Nick Ficano]
+
+- Cleanup. [Nick Ficano]
+
+  * pep8
+  * removed \n from exceptions
+  * normalized docstring parameters
+  * fix bug causing exception to be raised if no download path is
+    provided.
+  * changed FileExistsError to OSError for 2.7.x compat.
+
+
+- Clean up docstrings. [Nick Ficano]
+
+- Cleanup!! [Nick Ficano]
+
+  * added `from_url` method.
+  * added `set_filename` method.
+  * added deprecation warnings to setters.
+  * fixed typos.
+  * pep8.
+  * removed old comments.
+  * removed unnecessary TODOs.
+  * removed unused `_fetch`. method.
+
+
+- Vevovideonotworking : 1. Getting rid of default static function 2.
+  downloading from assets js always 3. Using jsinterp instead of tinyjs
+  since it was not working 4. vevo and everyother video with encrypted
+  signature downloads in similar way. [vidyuthd]
+
+- Vevo video download not working due to changed algo. [vidyuthd]
+
+- Default to cwd for path arg. [Enrique Fernandez]
+
+- Fix division by zero. [Enrique Fernandez]
+
+- Refs #2: - added posibility to provide full path to file. [Eloar]
+
+- Refs #1: - added argument to force file overwrite - changed exit to
+  rise exception on file name conflict. [Eloar]
+
+- Refs #4: - changed all exit usages to raise exceptions. [Eloar]
+
+- - added info about 3.4 support to README and setup.py. [Eloar]
+
+- - added __future__ import to example in README. [Eloar]
+
+- - added import print_function from __future__ for backward
+  compatibility to 2.6. [Janusz Paszyński]
+
+- - ported example in README to 3.4.1. [Janusz Paszyński]
+
+- - ported to 3.4.1 with backward compatibility. [Janusz Paszyński]
+
+- - added requirements information to README file. [Janusz Paszyński]
+
 0.2.0 (2014-09-28)
 ------------------
 
@@ -8,9 +77,27 @@ Changelog
 
 - Fix codeblock formatting. [Jose Diaz-Gonzalez]
 
-- Merge pull request #33 from NFicano/pypi-release. [Jose Diaz-Gonzalez]
+- Cleanup setup.py. [Jose Diaz-Gonzalez]
+
+- Add empty requirements.txt. [Jose Diaz-Gonzalez]
+
+  Many build/ci tools will see this and assume a python repository
+
+
+- Combine README.nd and README.rst. [Jose Diaz-Gonzalez]
 
-  Pypi release
+- Add missing MANIFEST.in. [Jose Diaz-Gonzalez]
+
+- Move LICENSE to LICENSE.txt. [Jose Diaz-Gonzalez]
+
+- Remove AUTHORS file. [Jose Diaz-Gonzalez]
+
+- Add necessary gitignore entries. [Jose Diaz-Gonzalez]
+
+  This will allow us to build packages without worrying about build artifacts
+
+
+- Add release script. [Jose Diaz-Gonzalez]
 
 - PEP8. [Jose Diaz-Gonzalez]
 
@@ -22,60 +109,78 @@ Changelog
 
 - Explicit exception imports, removed unused method. [Nick Ficano]
 
-- Updated readme. [Nick Ficano]
-
 - Commented, flake8, TODOs. [Nick Ficano]
 
-- Merge pull request #30 from josegonzalez/master. [Nick Ficano]
+- Add decryption support for vevo and dashmpd. Closes #25. [Jose Diaz-
+  Gonzalez]
+
+- Use proper indentation. [Jose Diaz-Gonzalez]
 
-  Add decryption support for vevo and dashmpd. Closes #25
+- Clean up logic behind indexing. [Jose Diaz-Gonzalez]
 
-- Merge pull request #29 from josegonzalez/master. [Nick Ficano]
+- Remove unnecessary imports. [Jose Diaz-Gonzalez]
 
-  PEP8
+  Also list out top-level imports separately
 
-- Merge pull request #28 from jaimecosme/master. [Nick Ficano]
 
-  Fix for two videos with same extension and resolution.
+- Add missing whitespace between operators. [Jose Diaz-Gonzalez]
 
-- Merge pull request #27 from sanfx/print_status_flush. [Nick Ficano]
+- Whitespace cleanup. [Jose Diaz-Gonzalez]
 
-  added a progress bar and percentage of download completed along with
-  human readable file size
+  As per PEP8, global functions need two newlines, class methods need 1, and all indentation should use spaces, not tabs
 
-- Merge pull request #26 from sanfx/print_status_flush. [Nick Ficano]
 
-  fixed printing  status, flushes previous status in terminal
+- Remove redundant backslashes. [Jose Diaz-Gonzalez]
 
-- Merge pull request #20 from chid/patch-1. [Nick Ficano]
+  They are not necessary between parenthesis
 
-  Update README.md
 
-- Merge pull request #21 from mursts/patch-py3. [Nick Ficano]
+- Fix for two videos with same extension and resolution. Two videos can
+  have tha same extension and resolution but a different profile. api.py
+  and models.py have been modified to set also the profile to be
+  downloaded and avoid this problem. [jaimecosme]
 
-  python 3 compatibility and convert tab to space
+- Added exit call when either resolution or extension is missed. [san]
 
-- Merge pull request #23 from masipcat/master. [Nick Ficano]
+- Covert relative path to absolute path at the time being passed from
+  commad line, updated Downlaoding message to print where the file is
+  saved to, check to make sure user passes both extension and resolution
+  and print to shell if not sure what resolution to choose, and fix for
+  progress bar dispay on windows. [san]
 
-  Now Pytube supports videos with signatures!
+- Working progress bar on OSx. [san]
 
-- Merge pull request #24 from masipcat/cipher_parser. [Nick Ficano]
+- Removed white spaces and call to _main in wrapper. [san]
 
-  Bug fixes related with signatures and optimizations
+- Added progress bar, and function to read size in human readable
+  format, updated call to print_status function. [san]
 
-- Merge pull request #19 from insideou7/master. [Nick Ficano]
+- Fixed printing  status, flushes prvious status. [san]
 
-  download uri now contains the signature by default.
+- Fixed python 3 compatibility. [mursts]
 
-- Merge pull request #16 from philipzae/patch-1. [Nick Ficano]
+- Convert tab to space. [mursts]
 
-  fixed spelling mistake
+- Bug fixed and faster. [JMasip]
+
+- Some optimizations. [JMasip]
+
+- Now Pytube supports videos with signatures! [JMasip]
+
+- _get_video_info(self) [insideou7]
+
+  I removed the video signatures. They are already included in the URL string, and apparently the old way of grabbing stream_map["sig"] returns an empty list, which returns an error in line 242
+
+- Fixed spelling mistake. [Jay Philips]
 
 - Added README.rst, updated copy. [NFicano]
 
-- Merge pull request #15 from b-mcg/master. [Nick Ficano]
+- Changed formatting. [b-mcg]
+
+- Changed formatting, added error checking during download, and added
+  downloading message. [b-mcg]
 
-  Possible merge.
+- Changed formatting. [b-mcg]
 
 - Rearranged imports in cli. [NFicano]
 
@@ -92,27 +197,41 @@ Changelog
 
 - Reverted back to setuptools. cleaned up setup.py. [NFicano]
 
-- Updated version. [NFicano]
-
 - Changed setuptools to distutils. [NFicano]
 
 - Renamed LICENSE.txt to LICENSE. [NFicano]
 
 - Fixed for PyPI! [NFicano]
 
-  * added setup.cfg * updated setup.py * renamed COPYING to LICENCE.txt.
+  * added setup.cfg
+  * updated setup.py
+  * renamed COPYING to LICENCE.txt.
+
 
-- Merge pull request #10 from randomchars/cli. [Nick Ficano]
+- Bump version number. [Richard Borcsik]
 
-  Add a comman line interface
+- Added error handling. [Richard Borcsik]
 
-- Updated README addressing how to get the highest resolution. [NFicano]
+- Add a command line tool. [Richard Borcsik]
 
-- Merge pull request #7 from randomchars/master. [Nick Ficano]
+- Added myself to the AUTHORS file. [Richard Borcsik]
 
-  Video info parsing and Python 3 fixes
+- PEP8 cleanup. [Richard Borcsik]
 
-- Updated for Python 3.x. [NFicano]
+- Corrected variable. [Richard Borcsik]
+
+- Correct indentation. [Richard Borcsik]
+
+- Add callbacks to Video.download. Refactored console printing into
+  utils.py. [Richard Borcsik]
+
+- Use the correct variable for filename. [Richard Borcsik]
+
+- Fixed handling of filename changes. Fix for #8. [Richard Borcsik]
+
+- Fixed video info parsing. [Richard Borcsik]
+
+- Fixed python 3 compatibility. [Richard Borcsik]
 
 - Added print statement back in, changed to rev 0.0.5, (1.0 will include
   unit tests, and CLI), update README. [NFicano]
@@ -120,20 +239,21 @@ Changelog
 - Python 3.x! Reorganized file structure, removed print statements.
   [NFicano]
 
-- Merge pull request #4 from randomchars/master. [Nick Ficano]
+- Python 3 compatibility fixes. [Richard Borcsik]
+
+  Signed-off-by: Richard Borcsik <richard@borcsik.com>
+
 
-  Python 3 fixes
+- Add video signature to download url. [Alejandro Blanco]
 
-- Merge pull request #2 from ablanco/master. [Nick Ficano]
+  YouTube has changed the API a bit, now it requires the video signature
+  in the download url.
 
-  Fix download urls
 
 - Pep8, pyflakes, fixed typos, better comments. [NFicano]
 
 - Rearranged/cleaned up instructions. [NFicano]
 
-- Updated README, added .psd to gitignore. [NFicano]
-
 - AND a typo.. [NFicano]
 
 - Modified installation instructions to use pip. [NFicano]
@@ -144,28 +264,30 @@ Changelog
 
 - Copy changes to README. [NFicano]
 
-- Updated README copy. [NFicano]
-
 - Added better exception handling, fixed a ton of bugs, added setup.py.
   [NFicano]
 
 - Fixed typos and added bugs to README. [NFicano]
 
-- Updated README and AUTHORS. [NFicano]
+- Evaluate the status code and do nothing upon failure. [Lorenzo Gil
+  Sanchez]
 
-- Merge pull request #1 from lorenzogil/master. [Nick Ficano]
-
-  Evaluate the status code and do nothing upon failure
+- Remove trailing whitespace. [Lorenzo Gil Sanchez]
 
 - Bug fixes, added ability to specify output directory. [Nick Ficano]
 
-  * added ability to specify an output directory. * added missing
-  quality profiles. * handled exception when unexcepted quality profile
-  returned. * videos now get sorted by quality profile.
+  * added ability to specify an output directory.
+  * added missing quality profiles.
+  * handled exception when unexcepted quality profile returned.
+  * videos now get sorted by quality profile.
+
 
 - General housekeeping, no code modified. [Nick Ficano]
 
-  * Added TODO * Added AUTHORS * Moved Licence agreement into COPYING.
+  * Added TODO
+  * Added AUTHORS
+  * Moved Licence agreement into COPYING.
+
 
 - Removed my hardcoded path I had lazily set. [Nick Ficano]
 
@@ -176,17 +298,20 @@ Changelog
   filename sanitizing function was causing the last word in the filename
   to get truncated.
 
+
 - Minor project reorganizing. [Nick Ficano]
 
   * Moved project into subdirectory, preparing to write setup script.
 
-- Updated readme to show off more features. [Nick Ficano]
 
 - Cleanup, Pep8, finished docstring, 100% std lib. [Nick Ficano]
 
-  * A bit of tidying some odds and ends. * Pep8 * Finished docstrings *
-  Removed ``requests`` dependency making it compatible out of the box *
-  Rewrote filename sanitization method, also fixing unicode error.
+  * A bit of tidying some odds and ends.
+  * Pep8
+  * Finished docstrings
+  * Removed ``requests`` dependency making it compatible out of the box
+  * Rewrote filename sanitization method, also fixing unicode error.
+
 
 - AH! forgot a trailing quote. [Nick Ficano]
 

README.rst

@@ -23,9 +23,6 @@ Installation
 
 If you are on Mac OS X or Linux, chances are that one of the following two commands will work for you:
 
-Installation
-============
-
 Using PIP via PyPI
 
 .. code:: bash
@@ -36,13 +33,13 @@ Using PIP via Github
 
 .. code:: bash
 
-    pip install git+git://github.com/NFicano/pytube.git@0.2.1#egg=pytube
+    pip install git+git://github.com/NFicano/pytube.git@0.3.1#egg=pytube
 
 Adding to your ``requirements.txt`` file (run ``pip install -r requirements.txt`` afterwards)
 
 .. code:: bash
 
-    git+ssh://git@github.com/NFicano/pytube.git@0.2.1#egg=pytube
+    git+ssh://git@github.com/NFicano/pytube.git@0.3.1#egg=pytube
 
 Manually via GIT
 

pytube/__init__.py

@@ -1,5 +1,5 @@
 __title__ = 'pytube'
-__version__ = '0.2.1'
+__version__ = '0.3.1'
 __author__ = 'Nick Ficano'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2015 Nick Ficano'

pytube/models.py

@@ -4,6 +4,8 @@ from __future__ import unicode_literals, print_function
 from os import remove
 from os.path import normpath, isfile, isdir
 from time import clock
+import logging
+
 try:
     from urllib2 import urlopen
 except ImportError:
@@ -72,9 +74,9 @@ class Video(object):
         try:
             with open(fullpath, 'wb') as dst_file:
                 # Print downloading message
-                print("Downloading: '{0}.{1}' (Bytes: {2}) to path: "
-                      "{3}".format(self.filename, self.extension,
-                        sizeof(file_size), path))
+                logging.info("Downloading: '{0}.{1}' (Bytes: {2}) to path: "
+                             "{3}".format(self.filename, self.extension,
+                                          sizeof(file_size), path))
 
                 while True:
                     self._buffer = response.read(chunk_size)