v0.5.14

rembo10 · Jun 2, 2016 · df2b56c · df2b56c
2 parents 4b80e2b + e168305
commit df2b56c
Show file tree

Hide file tree

Showing 51 changed files with 2,540 additions and 1,110 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -82,6 +82,9 @@
 			<div id="info">
 				<small>
 				<a href="https://github.com/rembo10/headphones"><i class="fa fa-headphones"></i> Website</a> |
+				%if headphones.CONFIG.GIT_USER != 'rembo10':
+					<a href="https://github.com/${headphones.CONFIG.GIT_USER}/headphones" title="Open this fork on github"><i class="fa fa-github"></i> GitHub</a> |
+				%endif
 				<a href="https://github.com/rembo10/headphones/wiki/TroubleShooting"><i class="fa fa-ambulance"></i> Help</a>
 				</small>
 			</div>

diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html
@@ -392,6 +392,12 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                                     <input type="text" name="deluge_host" value="${config['deluge_host']}" size="30">
                                     <small>Usually http://localhost:8112 (requires WebUI plugin)</small>
                                 </div>
+                                <div class="row">
+                                    <label>Deluge SSL Certificate</label>
+                                    <input type="text" name="deluge_cert" value="${config['deluge_cert']}" size="30">
+                                    <small>Path to the certificate file. Make sure to use a valid certificate ("Issued To" field must match 
+                                        hostname) which is <em>not</em> the case with the default certificate. Path is usually <span style="font-family: monospace;">%appdata%\deluge\ssl</span> on Windows, <span style="font-family: monospace;">~/.config/deluge/ssl/</span> on Linux. Leave this blank if you are using a self-signed certificate.</small>
+                                </div>
                                 <div class="row">
                                     <label>Deluge Password</label>
                                     <input type="password" name="deluge_password" value="${config['deluge_password']}" size="30">
@@ -888,7 +894,7 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                                     <div class="row">
                                         as <input type="text" class="override-float" name="album_art_format" value="${config['album_art_format']}" size="10">.jpg
                                     </div>
-                                    <small>Use $Artist/$artist, $Album/$album, $Year/$year, put optional variables in square brackets, use single-quote marks to escape square brackets literally ('[', ']').</small>
+                                    <small>Use $Artist/$artist, $Album/$album, $Year/$year, put optional variables in curly braces, use single-quote marks to escape curly braces literally ('{', '}').</small>
                                 </div>
                                 <div class="row checkbox left clearfix nopad">
                                     <label>
@@ -1283,13 +1289,13 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                             <div class="row">
                                 <label>Folder Format</label>
                                 <input type="text" name="folder_format" value="${config['folder_format']}" size="43">
-                                <small>Use: $Artist/$artist, $SortArtist/$sortartist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name), $OriginalFolder/$originalfolder (downloaded directory name). Put optional variables in square brackets, use single-quote marks to escape square brackets literally ('[', ']').<br>E.g.: $Type/$First/$artist/$album '['$year']' = Album/G/girl talk/all day [2010]</small>
+                                <small>Use: $Artist/$artist, $SortArtist/$sortartist, $Album/$album, $Year/$year, $Type/$type (release type) and $First/$first (first letter in artist name), $OriginalFolder/$originalfolder (downloaded directory name). Put optional variables in curly braces, use single-quote marks to escape curly braces literally ('{', '}').<br>E.g.: $Type/$First/$artist/$album{ '['$year']'} = Album/G/girl talk/all day [2010]</small>
 
                             </div>
                             <div class="row">
                                 <label>File Format</label>
                                 <input type="text" name="file_format" value="${config['file_format']}" size="43">
-                                <small>Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year. Put optional variables in square brackets, use single-quote marks to escape square brackets literally ('[', ']').</small>
+                                <small>Use: $Disc/$disc (disc #), $Track/$track (track #), $Title/$title, $Artist/$artist, $Album/$album and $Year/$year. Put optional variables in curly braces, use single-quote marks to escape curly braces literally ('{', '}').</small>
                             </div>
                             <div class="checkbox row clearfix">
                                 <input type="checkbox" name="file_underscores" id="file_underscores" value="1" ${config['file_underscores']}/><label>Use underscores instead of spaces</label>
@@ -1592,7 +1598,7 @@ <h1 class="clearfix"><i class="fa fa-gear"></i> Settings</h1>
                             <fieldset>
                                 <legend>Musicbrainz</legend>
                                 <div class="row">
-                                    <label>Muscbrainz Mirror</label>
+                                    <label>Musicbrainz Mirror</label>
                                     <select name="mirror" id="mirror">
                                     %for mirror in config['mirrorlist']:
                                         <%

diff --git a/data/interfaces/default/css/README.md b/data/interfaces/default/css/README.md
@@ -0,0 +1,25 @@
+# About less and css
+
+**The main message of this document: DO NOT MODIFY style.css - IT IS GENERATED FILE**
+
+----
+
+If you want modify the appearance of Headphones, please, follow this simple steps.
+
+0. **Install**. Do this just once, and if you still do not have `lessc` utility on your PC. Here is very useful guide, how to install less : [http://lesscss.org/#using-less-installation](http://lesscss.org/#using-less-installation)
+1. **Modify**. Carefully add your changes to the `style.less` (`.less` extension, not `.css`).
+2. **Compile**. Currently, there is no magic, so you should compile css manually. Go to the `/data/interfaces/default/css` folder (or use full paths..), and then just type:
+
+```bash
+lessc style.less > style.css
+```
+
+_works good on *nix hosts, I didn't test this on win-hosts_
+
+DONE. You have new CSS file.
+
+## LESS
+
+Less is very useful tool (CSS pre-processor) for CSS writing. There is the awesome guide on the official site: [Official Less Guide](http://lesscss.org/features/)
+
+Thanks!
diff --git a/data/interfaces/default/css/config.less b/data/interfaces/default/css/config.less
@@ -10,9 +10,16 @@
 @msg-bg:					#FFF6A9;
 @msg-bg-success:			#D3FFD7;
 @msg-bg-error:				#FFD3D3;
+@brand-color:				#4F4F4F;
+@caption-color:				#999999;
+
+@gradient-color-1:			#FAFAFA;
+@gradient-color-2:			#E7E7E7;
+
+@heading-input-radius:		5px;
 
 /* Mixins */
-.rounded(@radius: 5px) {	
+.rounded(@radius: 5px) {
 	-moz-border-radius: @radius;
 	-webkit-border-radius: @radius;
 	border-radius: @radius;
@@ -75,3 +82,32 @@
 	opacity:@opacity_percent / 100 !important;
 }
 
+
+/*
+	COLUMNS STUFF
+	https://css-tricks.com/guide-responsive-friendly-css-columns/
+*/
+.columnWidth(@width) {
+	-webkit-column-width: @width;
+	   -moz-column-width: @width;
+	        column-width: @width;
+}
+.columnCount(@count) {
+	-webkit-columns: @count;
+	   -moz-columns: @count;
+	        columns: @count;
+}
+.columnGap(@width) {
+	-webkit-column-gap: @width;
+	   -moz-column-gap: @width;
+	        column-gap: @width;
+}
+.columnRule(@border) {
+	-webkit-column-rule: @border;
+	   -moz-column-rule: @border;
+	        column-rule: @border;
+}
+.columnSpan(@what) {
+	-webkit-column-span: @what;
+	        column-span: @what;
+}
diff --git a/data/interfaces/default/css/font-awesome.min.css b/data/interfaces/default/css/font-awesome.min.css