diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 176a458f..00000000 --- a/.gitattributes +++ /dev/null @@ -1 +0,0 @@ -* text=auto diff --git a/.gitignore b/.gitignore index 8bacef32..29da270b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,20 +4,18 @@ .project .pydevproject -# coverage generated: +# coverage generated /cover-html/ .coverage .coveralls.yml -# Compiled source # -################### +# Compiled source *.pyc *.py~ *.pyproj *.sln -# Headphones files # -###################### +# Headphones files *.log *.db* *.db-journal @@ -26,27 +24,25 @@ version.lock logs/* cache/* -# HTTPS Cert/Key # -################## +# HTTPS Cert/Key *.crt *.key *.csr -# OS generated files # -###################### +# OS generated files .DS_Store? .DS_Store ehthumbs.db Icon? Thumbs.db -#Ignore files generated by PyCharm +# Ignore files generated by PyCharm .idea/* -#Ignore files generated by vi +# Ignore files generated by vi *.swp -#Ignore files build by Visual Studio +# Ignore files build by Visual Studio *.obj *.exe *.pdb @@ -72,3 +68,6 @@ obj/ [Rr]elease*/ _ReSharper*/ .vscode + +# Python virtual env +venv \ No newline at end of file diff --git a/.pep8 b/.pep8 index daa763d1..5c5608b9 100644 --- a/.pep8 +++ b/.pep8 @@ -1,15 +1,7 @@ [pep8] -# E121 continuation line under-indented for hanging indent -# E122 continuation line missing indentation or outdented -# E124 closing bracket does not match visual indentation -# E125 continuation line with same indent as next logical line # E126 continuation line over-indented for hanging indent # E127 continuation line over-indented for visual indent # E128 continuation line under-indented for visual indent -# E261 at least two spaces before inline comment -# E262 inline comment should start with '# ' -# E265 block comment should start with '# ' # E501 line too long (312 > 160 characters) -# E502 the backslash is redundant between brackets -ignore = E121,E122,E123,E124,E125,E126,E127,E128,E261,E262,E265,E501,E502 +ignore = E123,E126,E127,E128,E501 max-line-length = 160 diff --git a/.travis.yml b/.travis.yml index 165f65e3..41ad6f25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,36 +2,25 @@ # http://about.travis-ci.org/docs/ language: python + sudo: false cache: pip: true directories: - - lib + - lib -# Available Python versions: -# http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images python: - "2.6" -matrix: - include: - - python: "2.7" - env: SENDCOVERAGE=1 + - "2.7" -# pylint 1.4 does not run under python 2.6 install: - - pip install pyOpenSSL - - pip install pylint==1.3.1 - - pip install pyflakes - - pip install pep8 - # coverage stuff: - - pip install coveralls - - pip install coverage + - pip install -r requirements-dev.txt + script: - pep8 headphones - pyflakes headphones - nosetests after_success: - # coverage stuff: - - if [ $SENDCOVERAGE ]; then coveralls; fi + - if [[ $TRAVIS_PYTHON_VERSION == "2.7" ]]; then coveralls; fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e8d45ae..f4bb2bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changelog +## v0.5.14 +Released 02 June 2016 + +Highlights: +* Fixed: File/folder format on new installs +* Fixed: Pep8 errors +* Improved: Updated fontawesome +* Improved: Reverted back to less + +The full list of commits can be found [here](https://github.com/rembo10/headphones/compare/v0.5.13...v0.5.14). + ## v0.5.13 Released 25 February 2016 diff --git a/README.md b/README.md index 87eb2f36..ff1e214b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ##![Headphones Logo](https://github.com/rembo10/headphones/raw/master/data/images/headphoneslogo.png) Headphones -**Master Branch:** [![Build Status](https://travis-ci.org/rembo10/headphones.svg?branch=master)](https://travis-ci.org/rembo10/headphones) -**Develop Branch:** [![Build Status](https://travis-ci.org/rembo10/headphones.svg?branch=develop)](https://travis-ci.org/rembo10/headphones) +[![Build Status](https://travis-ci.org/rembo10/headphones.svg?branch=master)](https://travis-ci.org/rembo10/headphones) +[![Build Status](https://img.shields.io/travis/rembo10/headphones/develop.svg?label=develop%20branch%20build)](https://travis-ci.org/rembo10/headphones) Headphones is an automated music downloader for NZB and Torrent, written in Python. It supports SABnzbd, NZBget, Transmission, µTorrent, Deluge and Blackhole. diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index f95be978..9dfa8a9d 100644 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -82,6 +82,9 @@
Website | + %if headphones.CONFIG.GIT_USER != 'rembo10': + GitHub | + %endif Help
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 9ba9f2aa..ffd6e68d 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -392,6 +392,12 @@ Usually http://localhost:8112 (requires WebUI plugin) +
+ + + Path to the certificate file. Make sure to use a valid certificate ("Issued To" field must match + hostname) which is not the case with the default certificate. Path is usually %appdata%\deluge\ssl on Windows, ~/.config/deluge/ssl/ on Linux. Leave this blank if you are using a self-signed certificate. +
@@ -888,7 +894,7 @@
as .jpg
- Use $Artist/$artist, $Album/$album, $Year/$year, put optional variables in square brackets, use single-quote marks to escape square brackets literally ('[', ']'). + Use $Artist/$artist, $Album/$album, $Year/$year, put optional variables in curly braces, use single-quote marks to escape curly braces literally ('{', '}').