From 3baf418002493e5322ce0892f467080f3ead361b Mon Sep 17 00:00:00 2001
From: gfxmonk <tim@gfxmonk.net>
Date: Sat, 13 Aug 2011 22:48:25 +1000
Subject: [PATCH] .

---
 bin/0template          |  2 +-
 bin/eachpath           |  2 +-
 bin/irank-android-sync | 60 ++----------------------------------------
 home/gitconfig         |  2 ++
 home/gitignore         |  2 ++
 meta/links.yml         |  3 +++
 6 files changed, 11 insertions(+), 60 deletions(-)
 create mode 100644 home/gitignore

diff --git a/bin/0template b/bin/0template
index b0301c80..c2ca4947 100755
--- a/bin/0template
+++ b/bin/0template
@@ -7,7 +7,7 @@ template="""<?xml version="1.0" ?>
 <interface uri="http://gfxmonk.net/dist/0install/%(filename)s" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
 	<name>%(name)s</name>
 	<summary>___</summary>
-	<publish mode="featured|third-party|package|ignore" xmlns="http://gfxmonk.net/dist/0install"/>
+	<publish mode="featured|third-party|package|0tools|ignore" xmlns="http://gfxmonk.net/dist/0install"/>
 	<description>
 	___
 	</description>
diff --git a/bin/eachpath b/bin/eachpath
index 3d5d094b..b6a68818 100755
--- a/bin/eachpath
+++ b/bin/eachpath
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -e
-[ "$#" -gt 2 ]
+[ "$#" -gt 2 ] || (echo "usage: eachpath 'foo:bar:baz' action"; exit 1)
 str="$1"
 shift 1
 echo -n "$str" | parallel -d: "$@"
diff --git a/bin/irank-android-sync b/bin/irank-android-sync
index 1ff56827..a5adb65e 100755
--- a/bin/irank-android-sync
+++ b/bin/irank-android-sync
@@ -1,69 +1,13 @@
 #!/bin/bash
 
 irank_base="$HOME/Music/irank"
-# music_base="$HOME/Music"
-# all_music="$music_base/Library"
-# master="master"
-
-# function playlists {
-# 	cat "$HOME/.config/irank/android-playlists"
-# }
-# 
-# _required_files=''
-# function required_files {
-# 	if [ -z "$_required_files" ]; then
-# 		_required_files="$(playlists | parallel "ls -1 '$irank_base/'{} | head -n900" | sort -u)"
-# 	fi
-# 	echo "$_required_files"
-# }
-# 
-# function existing_files {
-# 	ls -1 "$dest/$master"
-# }
-# 
-# function files_no_longer_needed {
-# 	# just print lines unique to existing_files
-# 	comm -3 -1 <(required_files) <(existing_files)
-# }
-# 
-# function delete_old_music {
-# 	files_no_longer_needed | parallel "rm -v '$dest/master'/{}"
-# }
-# 
-# function rsync_ {
-# 	rsync -vt --modify-window=2 "$@"
-# }
-# 
-# function update_music_files {
-# 	required_files | rsync_ --files-from=- "$all_music/" "$dest/master/" || err=$?
-# 	if [ $? -ne 0 ]; then
-# 		echo "warning: rsync failed! $err"
-# 		[ $err = 23 ] # this is acceptable; it means some files didn't transfer (they may be in a different dir)
-# 	fi
-# }
-
-# function copy_testing_files {
-# 	rsync_ -a --delete-before "$music_base/TESTING/" "$dest/TESTING/"
-# 	ls -1 "$dest/TESTING" > "$dest/TESTING.m3u"
-# }
 
 function overwrite_android_db {
 	cp "$irank_base/irank.sqlite" "$dest/"
 }
 
-# function make_playlists {
-# 	rm -f "$dest/*.m3u" || echo "can't remove playlists..."
-# 	playlists | parallel "ls -1 '$irank_base/'{}/ | sed -e 's/^/$master\//'  '$dest/'{}.m3u"
-# 	existing_files | sed -e 's/^/master\//' > "$dest/master.m3u"
-# }
-
 function do_sync {
 	irank export -d "$dest" `cat ~/.config/irank/android-playlists`
-	# mkdir -p "$dest/master"
-	# delete_old_music
-	# update_music_files
-	# make_playlists
-	# copy_testing_files
 	overwrite_android_db
 
 	echo '-------- DISK USAGE: -----------'
@@ -75,7 +19,7 @@ function do_sync {
 
 function num_remote_rating_changes {
 	if [ -r "$dest/irank.sqlite" ]; then
-		sqlite3 "$dest"/irank.sqlite 'select count(*) from updates;' || echo 0
+		irank rating-sync --count
 	else
 		echo 0
 	fi
@@ -86,7 +30,7 @@ function apply_remote_rating_changes {
 	if [ ! -r "$dest/irank.sqlite" ]; then
 		return 0
 	fi
-	num_updates="$(irank rating-sync --count)"
+	num_updates="$(num_remote_rating_changes)"
 	if [ "$num_updates" -eq 0 ]; then
 		return 0
 	fi
diff --git a/home/gitconfig b/home/gitconfig
index b9d7d59b..5b22b455 100644
--- a/home/gitconfig
+++ b/home/gitconfig
@@ -30,3 +30,5 @@
 [user]
 	name = gfxmonk
 	email = tim@gfxmonk.net
+[core]
+	excludesfile = /home/tim/.gitignore
diff --git a/home/gitignore b/home/gitignore
new file mode 100644
index 00000000..08bfcb6b
--- /dev/null
+++ b/home/gitignore
@@ -0,0 +1,2 @@
+.tags
+*.pyc
diff --git a/meta/links.yml b/meta/links.yml
index 57b844d3..fb6b7e37 100644
--- a/meta/links.yml
+++ b/meta/links.yml
@@ -78,6 +78,9 @@ meta:
 ~/.gitconfig:
   path: ../home/gitconfig
 
+~/.gitignore:
+  path: ../home/gitignore
+
 
 ## KEYBOARD TYPES
 ~/.xkb: