.gitattributes & .gitignore rewritten

2 files changed, 82 insertions, 54 deletions

diff --git a/.gitattributes b/.gitattributes
index 0a6781fd8..06374b854 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,21 +1,34 @@
 # Set default behaviour, in case users don't have core.autocrlf set.
 * text=auto
 
-# Explicitly declare text files we want to always be normalized and converted 
+# Explicitly declare text files we want to always be normalized and converted
 # to native line endings on checkout.
-*.py text
-*.js text
-*.po text
 *.cfg text
-*.md text
+*.coffee text
+*.conf text
+*.htm text
+*.html text
 *.in text
-*.txt text
-*.sh text
+*.js text
 *.json text
-*.html text
-.htm text
+*.md text
+*.po text
+*.pot text
+*.py text
+*.rst text
+*.sh text
+*.thrift text
+*.txt text
+*.yaml text
+*.xml text
 
 # Denote all files that are truly binary and should not be modified.
-*.png binary
+*.ico binary
+*.gif binary
 *.jpg binary
 *.mo binary
+*.pyc binary
+*.png binary
+*.svg binary
+*.rar binary
+*.zip binary
diff --git a/.gitignore b/.gitignore
index f6ad32bca..c78dbc04a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,35 @@
-*.py[cod]
-
-# C extensions
-*.so
-
 # Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
+bin/*
+build/*
+dist/*
+env/*
 lib/*
-lib64
+lib64/*
+parts/*
+var/*
+sdist/*
+
+# Common pyLoad directories
+Downloads/*
+Logs/*
+docs/_build/*
+docs/module/*
+docs/pyload/*
+#module/*
+pyload/*
+
+# Common MacOS & Windows files
+*.DS_Store
+Thumbs.db
+desktop.ini
+
+# Temp stuff
 __pycache__
+.tmp
+temp
 
-# Installer logs
+# Installers stuff
+.installed.cfg
 pip-log.txt
 
 # Unit test / coverage reports
@@ -27,6 +37,16 @@ pip-log.txt
 .tox
 nosetests.xml
 
+# Compiled files
+*.so
+#*.py[cod]
+
+# EGG
+*.egg
+*.egg-info
+develop-eggs
+eggs
+
 # Mr Developer
 .mr.developer.cfg
 .project
@@ -35,36 +55,31 @@ nosetests.xml
 # PyCharm
 .idea
 
-# ignoreing unneeded files, using glob syntax
+# Other development files
+.svn
 *~
+*.orig
 *.pidaproject
-.svn
-*.DS_Store
-*.egg-info
+*.prefs
 *.project
 *.pydevproject
-Downloads/*
-container/*
-Logs/*
-docs/module/
-docs/_build
-module/plugins/container/DLC_*.py
-failed_links.txt
-module/config/gui.xml
-module/config/core.xml
-module/config/plugin.xml
-links.txt
+*.rej
+DLC_*.py
+paver-minilib.zip
+
+# Certificates
+cert.pem
 ssl.crt
 ssl.key
-cert.pem
+
+# Common pyLoad files
+*_links.txt
+links.txt
+module/config/core.xml
+module/config/gui.xml
+module/config/plugin.xml
 module/web/pyload.db
-*.svg
-*.prefs
-*.orig
-*.rej
-pyload/*
-dist/*
-build/*
-setup.py
-paver-minilib.zip
-env/*
+#pyload/config/core.xml
+#pyload/config/gui.xml
+#pyload/config/plugin.xml
+#pyload/web/pyload.db