Remove Builds, improved build process, added -f flag for optional fil…

…ename, slightly better output

.gitignore

@@ -1 +1,3 @@
 allmusic-scrape.zip
+/builds
+page.html

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2018 Cromon (Eugene Rasini)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -6,20 +6,34 @@ Album ID is found at the end of the URL beginning  with 'mw'
 
 e.g. on Linux
 
-```./builds/allmusic-scraper-linux -i  mw0000275621```
+```./builds/allmusic-scraper-linux-amd64 -i mw0000275621```
 
-This will write a file called data.txt with Song Names and Composers
+Or with optional filename
 
-### Executables
+```./builds/allmusic-scraper-linux-amd64 -i mw0000275621 -f scrape.txt```
 
-Executables are in the builds folder
+Run without arguments to get a list of options that can be passed to the binary
 
-Linux - allmusic-scraper-linux
+This will write a file called data.txt in the format
 
-#### Unested builds
+Artist - Album Title
+
+Song Names [ Composers ]
+
+### Building Binaries
+
+- Clone the repo
+
+- Run ``` ./build-allmusic-scraper.sh```
+
+It is setup to build for the following platforms
 
 Windows 32bit - allmusic-scrape-windows-386.exe
 
 Windows 64bit - allmusic-scrape-windows-amd64.exe
 
-MacOS (untested) - allmusic-scrape-darwin-amd64
+MacOS - allmusic-scrape-darwin-amd64
+
+#### For Linux
+
+Run ```go build allmusic-scrape```

VERSION

@@ -0,0 +1 @@
+0.0.2-alpha

build-allmusic-scraper.sh

@@ -8,14 +8,21 @@ fi
 package_split=(${package//\// })
 package_name=${package_split[-1]}
 
-platforms=("windows/amd64" "windows/386" "darwin/amd64")
+platforms=("windows/amd64" "windows/386" "darwin/amd64" "linux/amd64")
+BUILD_DIR=builds
+VERSION=`cat VERSION`
+if [ `ls | grep $BUILD_DIR` ]; then
+    cd $BUILD_DIR
+else
+    mkdir $BUILD_DIR && cd $BUILD_DIR
+fi
 
 for platform in "${platforms[@]}"
 do
     platform_split=(${platform//\// })
     GOOS=${platform_split[0]}
     GOARCH=${platform_split[1]}
-    output_name=$package_name'-'$GOOS'-'$GOARCH
+    output_name=$package_name'-'$GOOS'-'$GOARCH'-'$VERSION
     if [ $GOOS = "windows" ]; then
         output_name+='.exe'
     fi  

main.go

@@ -11,10 +11,11 @@ import (
 )
 
 var (
-	id     string
-	url    string
-	parent string
-	page   string
+	id       string
+	url      string
+	parent   string
+	page     string
+	filename string
 )
 
 func main() {
@@ -30,7 +31,7 @@ func main() {
 		fmt.Printf("Album ID is missing, please re-run\n")
 		os.Exit(1)
 	}
-	err := ioutil.WriteFile("./data.txt", nil, 0754)
+	err := ioutil.WriteFile(filename, nil, 0754)
 	check(err)
 	scrapeAllMusic(id)
 }
@@ -45,6 +46,7 @@ func scrapeAllMusic(id string) {
 
 func init() {
 	flag.StringVarP(&id, "id", "i", "", "Pass the ID of the allmusic album page")
+	flag.StringVarP(&filename, "filename", "f", "data.txt", "Pass in an optional filename")
 }
 
 func check(e error) {
@@ -65,7 +67,7 @@ func parseDoc(page string) {
 
 	artist := strings.Trim(doc.Find(".album-artist span a").Text(), "  ")
 	album := strings.Trim(doc.Find(".album-title").Text(), " ")
-	f, err := os.OpenFile("./data.txt", os.O_APPEND|os.O_WRONLY, 0644)
+	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, 0644)
 	defer f.Close()
 
 	f.WriteString(string(artist + " - " + album + "\n"))
@@ -74,16 +76,16 @@ func parseDoc(page string) {
 	doc.Find(".title-composer").Each(func(index int, item *goquery.Selection) {
 		title := strings.Trim(item.Find(".title a").Text(), " ")
 		composer := strings.Trim(item.Find(".composer a").Text(), " ")
-		writeRelease(title, composer)
+		writeRelease(artist, title, composer)
 	})
 	check(err)
 }
 
-func writeRelease(t, c string) {
-	f, err := os.OpenFile("./data.txt", os.O_APPEND|os.O_WRONLY, 0644)
+func writeRelease(a, t, c string) {
+	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, 0644)
 	defer f.Close()
 
-	f.WriteString(string(t + " - " + c + "\n"))
+	f.WriteString(string(a + " - " + t + " [" + c + "]" + "\n"))
 
 	check(err)
 	return