Path more flexible now

Author: rokdd

README.md

@@ -27,7 +27,7 @@ INSTALLED_APPS = (
 In your templates add depending on the library and how you named the folder:
 ```html
 {% load static %}
-<script src="{% static 'latest_auto_static_libs/jquery/jquery.min.js' %}" type="text/javascript"></script>
+<script src="{% static 'latest-auto-static-libs/jquery/jquery.min.js' %}" type="text/javascript"></script>
 ```
 
 You must run the downloading at the beginning (or to update). It will run automatically at migration:
@@ -48,7 +48,7 @@ Currently it supports the following libraries (bold is the name of the correspon
 * **fomantic_ui**: [Fomantic-UI](https://fomantic-ui.com/) from github (fork of semantic UI)
 * **semantic_ui**: [Semantic-UI](https://semantic-ui.com/) from github
 * **masonry**: [Masonry](https://masonry.desandro.com/) from github
-* **pygal_js**: [pygal.js](https://github.com/Kozea/pygal.js/)Javascript helper functions for pygal from github
+* **pygal_js**: [pygal.js](https://github.com/Kozea/pygal.js/) Javascript helper functions for pygal from github
 
 
 In your settings.py:
@@ -57,17 +57,17 @@ In your settings.py:
 from django_static_libs.libraries import jquery
 DJANGO_AUTO_STATIC_LIBS = {
 #The default is the jquery library. If you add other or custom libraries it will replace the default. it need always to be a dict, the key represents your folder and will be needed for the static import
-'libraries': {
-'jquery':jquery,
-'custom_full':
-{
-'provider' : GithubProvider("jquery/jquery"),
-'suffix_ignore': [".json"],
-'files_include': r"jquery-[\d\.]+/dist/(.*\.(js|map))",
-#auto creates in your static root a folder "latest_static_libs". If you change this default path be careful in the templates
-'destination':"auto",
-}
-}
+    'libraries': {
+        'jquery': jquery,
+        'custom_full': {
+            'provider' : GithubProvider("jquery/jquery"),
+            'suffix_ignore': [".json"],
+            'files_include': r"jquery-[\d\.]+/dist/(.*\.(js|map))",
+            #auto creates in your static root a folder "latest_static_libs". If you change this default path be careful in the templates
+            'destination': "auto",
+        }
+    },
+    'destination_folder': 'django-auto-static-libs'
 }
 ```
 ## Add your custom library
@@ -89,4 +89,5 @@ You can add your own library as a dict into the config. Please submit your confi
 * add more libraries for downloading
 * new command: list of all libraries
 * remember the currently installed version
+* improve logging / no prints
 * testing

django_auto_static_libs/__init__.py

@@ -3,7 +3,7 @@
 Version code adopted from Django development version.
 https://github.com/django/django
 """
-VERSION = (0, 4,1, 'final', 0)
+VERSION = (0, 4,2, 'final', 0)
 
 def get_version(version=None):
     """

django_auto_static_libs/management/commands/static-libs-download.py

@@ -50,7 +50,7 @@ def handle(self, *args, **kwargs):
 				print("Could not find type of library")
 				continue
 			if not "destination" in lib or lib["destination"] == "auto":
-				lib["destination"] = os.path.join(settings.STATIC_ROOT, "latest_auto_static_libs")
+				lib["destination"] = settings.DESTINATION_ROOT
 			else:
 				print("Currently only auto path is support as destination")
 				#>> > variables = {"publication": "article", "author": "Me"}

django_auto_static_libs/settings.py

@@ -1,12 +1,22 @@
 from django.conf import settings as django_settings
 from django.core.exceptions import ImproperlyConfigured
 from django_auto_static_libs.libraries import jquery
+import os
 
-if not hasattr(django_settings,"STATIC_ROOT"):
-	raise ImproperlyConfigured("Django-auto-static-libs needs STATIC_ROOT in settings.py")
-STATIC_ROOT=getattr(django_settings,"STATIC_ROOT")
+DJANGO_AUTO_STATIC_LIBS = dict(libraries={
+	'jquery': jquery
+}, destination_folder='django-auto-static-libs')
 
-DJANGO_AUTO_STATIC_LIBS=getattr(django_settings,"DJANGO_AUTO_STATIC_LIBS",{"libraries": {
-		'jquery': jquery
-	}
-	})
+if hasattr(django_settings, "DJANGO_AUTO_STATIC_LIBS"):
+	if 'libraries' in getattr(django_settings, "DJANGO_AUTO_STATIC_LIBS"):
+		DJANGO_AUTO_STATIC_LIBS['libraries'] = getattr(django_settings, "DJANGO_AUTO_STATIC_LIBS")['libraries']
+	DJANGO_AUTO_STATIC_LIBS = {**DJANGO_AUTO_STATIC_LIBS, **getattr(django_settings, "DJANGO_AUTO_STATIC_LIBS")}
+
+# check whether the folder is a proper path
+if not os.path.isabs(DJANGO_AUTO_STATIC_LIBS['destination_folder']):
+	if not hasattr(django_settings, "STATIC_ROOT"):
+		raise ImproperlyConfigured("Django-auto-static-libs needs STATIC_ROOT in settings.py")
+	STATIC_ROOT = getattr(django_settings, "STATIC_ROOT")
+	DESTINATION_ROOT=os.path.join(STATIC_ROOT,DJANGO_AUTO_STATIC_LIBS['destination_folder'])
+else:
+	DESTINATION_ROOT=DJANGO_AUTO_STATIC_LIBS['destination_folder']