Josep Batalle avatar Josep Batalle committed 2aa3490 Merge

Merged in develop (pull request #2)

Version 1.2

Comments (0)

Files changed (6)

 
 This script allows you to listen your music allocated in your account in Google Music in your Amarok player.
 
-INSTRUCTIONS
+== INSTRUCTIONS ==
 Download this script and put it into scripts directory (usually ~/.kde/share/apps/amarok/scripts/). Then, active the script in your Amarok 
 configuration.
 
-IMPORTANT
-You need to give execution permissions to the google_music.sh file.
-
-You can use the following command: 
-
-  chmod +x ~/.kde4/share/apps/amarok/scripts/google_music/google_music.sh
-  
-or if you stay inside the folder:
-
-  chmod +x google_music.sh
+== IMPORTANT ==
+You need to have installed curl.
 
 Once the plugin is installed, you can see a new option in Tools Menu. Here you have to put your google account. Then, you can download the 
-list of songs pushing the button allocated in the Tools Menu ("Update Google Music List"). After a few seconds, AMarok shows an alert in 
+list of songs pushing the button allocated in the Tools Menu ("Update Google Music List"). After a few seconds, Amarok shows an alert in 
 order to confirm the correct downloaded. Then restart Amarok to check the list of songs downloaded.
 
 At this moment is only a basic system, works fine but needs more little changes in order to improve the reliability.

docs/CHANGELOG.txt

+v1.2:
+- Bash script functions passed to javascript.
 v1.0:
 - First script release.
 configuration.
 
 IMPORTANT
-You need to give execution permissions to the google_music.sh file.
-
-You can use the following command: 
-
-  chmod +x ~/.kde4/share/apps/amarok/scripts/google_music/google_music.sh
-  
-or if you stay inside the folder:
-
-  chmod +x google_music.sh
+You need to have installed curl.
 
 Once the plugin is installed, you can see a new option in Tools Menu. Here you have to put your google account. Then, you can download the 
-list of songs pushing the button allocated in the Tools Menu ("Update Google Music List"). After a few seconds, AMarok shows an alert in 
+list of songs pushing the button allocated in the Tools Menu ("Update Google Music List"). After a few seconds, Amarok shows an alert in 
 order to confirm the correct downloaded. Then restart Amarok to check the list of songs downloaded.
 
 At this moment is only a basic system, works fine but needs more little changes in order to improve the reliability.
+/*
+
+Version: 1.2
+*/
+
 function detectCurl() {
     var p = new QProcess();
     p.start("which", ["curl"], QIODevice.ReadOnly);
+/*#########################################################################
+#                                                                         #
+#   This Script allows you to listen the music allocated in google        #
+#   music account using Amarok                                            #
+#                                                                         #
+#   Copyright                                                             #
+#                                                                         #
+#   (C)  2013 Josep Batalle Oronich <jbatalle3@gmail.com>                 #
+#                                                                         #
+#   This program is free software; you can redistribute it and/or modify  #
+#   it under the terms of the GNU General Public License as published by  #
+#   the Free Software Foundation; either version 2 of the License, or     #
+#   (at your option) any later version.                                   #
+#                                                                         #
+#   This program is distributed in the hope that it will be useful,       #
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of        #
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         #
+#   GNU General Public License for more details.                          #
+#                                                                         #
+#   You should have received a copy of the GNU General Public License     #
+#   along with this program; if not, write to the                         #
+#   Free Software Foundation, Inc.,                                       #
+#   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         #
+##########################################################################*/
+
 Importer.loadQtBinding("qt.core");
 Importer.loadQtBinding("qt.gui");
 Importer.include("config.js");
 X-KDE-PluginInfo-Author=Josep Batalle
 X-KDE-PluginInfo-Email=jbatalle@gmail.com
 X-KDE-PluginInfo-Name=Google Music for Amarok
-X-KDE-PluginInfo-Version=1.0
+X-KDE-PluginInfo-Version=1.2
 X-KDE-PluginInfo-Category=Scriptable Service
 X-KDE-PluginInfo-Depends=Amarok2
 X-KDE-PluginInfo-License=LGPL
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.