From 51e8b17f9f6f1f6f4fde0b943290186efd9db7f9 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Sun, 28 Sep 2014 20:33:50 +1000 Subject: [PATCH] python2 and tabs to spaces --- ffclicker | 52 +++++++++++++++---------------- gen-new-list | 18 +++++------ mediawrap | 38 +++++++++++------------ monitor-dir | 6 ++-- mythsymlink | 86 ++++++++++++++++++++++++++-------------------------- 5 files changed, 100 insertions(+), 100 deletions(-) diff --git a/ffclicker b/ffclicker index 9fa68d3..c41e84f 100755 --- a/ffclicker +++ b/ffclicker @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import cherrypy import os @@ -6,35 +6,35 @@ import sys import webbrowser class Listener(object): - @cherrypy.expose - def firefox(self, url): - print "Loading:", url - webbrowser.open(url) - raise cherrypy.HTTPRedirect(url, status=303) + @cherrypy.expose + def firefox(self, url): + print "Loading:", url + webbrowser.open(url) + raise cherrypy.HTTPRedirect(url, status=303) def do_fork(): - pid = os.fork() - if pid < 0: - print >>sys.stderr, "Unable to fork!" - sys.exit(1) - if pid != 0: - sys.exit(0) + pid = os.fork() + if pid < 0: + print >>sys.stderr, "Unable to fork!" + sys.exit(1) + if pid != 0: + sys.exit(0) def main(fork): - if fork: - do_fork() - cherrypy.tree.mount(Listener()) - cherrypy.server.socket_host = "0.0.0.0" - cherrypy.server.socket_port = 8080 - cherrypy.engine.start() + if fork: + do_fork() + cherrypy.tree.mount(Listener()) + cherrypy.server.socket_host = "0.0.0.0" + cherrypy.server.socket_port = 8080 + cherrypy.engine.start() if __name__ == "__main__": - fork = False - if len(sys.argv) != 1: - if sys.argv[1] == "--fork": - fork = True - else: - print >>sys.stderr, "Usage: %s [--fork]" % sys.argv[0] - sys.exit(1) - main(fork) + fork = False + if len(sys.argv) != 1: + if sys.argv[1] == "--fork": + fork = True + else: + print >>sys.stderr, "Usage: %s [--fork]" % sys.argv[0] + sys.exit(1) + main(fork) diff --git a/gen-new-list b/gen-new-list index ddab94a..9c072e7 100755 --- a/gen-new-list +++ b/gen-new-list @@ -3,8 +3,8 @@ set -e if [ -z "$1" ]; then - echo "Usage: $0 /path/to/videos [new-link-dir] [num_days]" - exit 1 + echo "Usage: $0 /path/to/videos [new-link-dir] [num_days]" + exit 1 fi watch_dir="$1" @@ -14,11 +14,11 @@ num_days="${3:-14}" find "$watch_dir/-NEW-" -type l -delete find "$watch_dir" -type f -mtime "-${num_days}" | - while read line; do - if basename "$line" | grep -q '^\.'; then - continue - fi - linkname="$(echo "$line" | sed -e "s|$watch_dir/||" -e "s|/| - |g")" - ln -s "$line" "$watch_dir/-NEW-/$linkname" - done + while read line; do + if basename "$line" | grep -q '^\.'; then + continue + fi + linkname="$(echo "$line" | sed -e "s|$watch_dir/||" -e "s|/| - |g")" + ln -s "$line" "$watch_dir/-NEW-/$linkname" + done diff --git a/mediawrap b/mediawrap index 1c4c396..7377c69 100755 --- a/mediawrap +++ b/mediawrap @@ -5,31 +5,31 @@ PULSESTATE="$HOME/.pulseaudio.state" ( if ! flock -w 10 -x 200; then - echo "Failed to get a lock!" - exit 1 + echo "Failed to get a lock!" + exit 1 fi echo "got lock" # Unmute everything and turn volume to full if [ "$1" = "--max-volume" ]; then - echo "max volume" - max_volume=1 - shift - pacmd 'dump' | grep 'set-sink' > "$PULSESTATE" - cat "$PULSESTATE" | grep 'set-sink-mute' | awk '{print $2;}' | \ - while read device; do - pacmd "set-sink-volume $device 0x10000" > /dev/null - pacmd "set-sink-mute $device no" > /dev/null - done + echo "max volume" + max_volume=1 + shift + pacmd 'dump' | grep 'set-sink' > "$PULSESTATE" + cat "$PULSESTATE" | grep 'set-sink-mute' | awk '{print $2;}' | \ + while read device; do + pacmd "set-sink-volume $device 0x10000" > /dev/null + pacmd "set-sink-mute $device no" > /dev/null + done fi # Switch volume keys to F9/F10 with xmodmap if [ "$1" = "--switch-volume-keys" ]; then - echo "switch volume" - switch_volume=1 - shift - xmodmap -e 'keycode 122 = F9' - xmodmap -e 'keycode 123 = F10' + echo "switch volume" + switch_volume=1 + shift + xmodmap -e 'keycode 122 = F9' + xmodmap -e 'keycode 123 = F10' fi @@ -39,13 +39,13 @@ fi # Restore volume levels and mute status if [ -n "$max_volume" ]; then - cat "$PULSESTATE" | pacmd > /dev/null + cat "$PULSESTATE" | pacmd > /dev/null fi # Restore volume keys if [ -n "$switch_volume" ]; then - xmodmap -e 'keycode 122 = XF86AudioLowerVolume' - xmodmap -e 'keycode 123 = XF86AudioRaiseVolume' + xmodmap -e 'keycode 122 = XF86AudioLowerVolume' + xmodmap -e 'keycode 123 = XF86AudioRaiseVolume' fi ) 200>"$LOCKFILE" diff --git a/monitor-dir b/monitor-dir index 84d35f0..baf02e4 100755 --- a/monitor-dir +++ b/monitor-dir @@ -4,15 +4,15 @@ # */5 * * * * $HOME/bin/monitor-dir /path/to/something if [ -z "$1" ]; then - echo "Usage $0 dir [monitor_file] [ls]" - exit 1 + echo "Usage $0 dir [monitor_file] [ls]" + exit 1 fi mon="${2:-$1/.monitor_dir}" mon_tmp="${mon}_tmp" ${3:-ls} "$1" > "$mon_tmp" if [ -r "$mon" ] && ! cmp -s "$mon" "$mon_tmp" && [ -n "$(ls "$1")" ]; then - comm -13 "$mon" "$mon_tmp" + comm -13 "$mon" "$mon_tmp" fi mv "$mon_tmp" "$mon" diff --git a/mythsymlink b/mythsymlink index efccc17..06ece07 100755 --- a/mythsymlink +++ b/mythsymlink @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 import MySQLdb import os @@ -12,27 +12,27 @@ os.chdir(sys.argv[1]) # Remove any symlinks and empty dirs in the tree for dirpath, dirnames, filenames in os.walk(".", topdown=False): - for filename in filenames: - filename = os.path.join(dirpath, filename) - if os.path.islink(filename): - os.unlink(filename) - for dirname in dirnames: - dirname = os.path.join(dirpath, dirname) - os.rmdir(dirname) + for filename in filenames: + filename = os.path.join(dirpath, filename) + if os.path.islink(filename): + os.unlink(filename) + for dirname in dirnames: + dirname = os.path.join(dirpath, dirname) + os.rmdir(dirname) # Connect to the MythTV database based on the MythTV config config_values = {} for line in open(os.path.expanduser("~/.mythtv/mysql.txt")): - line = line.strip() - if line and not line.startswith("#"): - (key, value) = line.split("=") - config_values[key] = value + line = line.strip() + if line and not line.startswith("#"): + (key, value) = line.split("=") + config_values[key] = value db_connection = MySQLdb.connect( - host = config_values["DBHostName"], - user = config_values["DBUserName"], - passwd = config_values["DBPassword"], - db = config_values["DBName"] + host = config_values["DBHostName"], + user = config_values["DBUserName"], + passwd = config_values["DBPassword"], + db = config_values["DBName"] ) cursor = db_connection.cursor(MySQLdb.cursors.DictCursor) @@ -41,45 +41,45 @@ unsafe = re.compile("[^a-zA-Z0-9\-_ ,\\.]+") # Find the recordings directory cursor.execute(""" - SELECT * FROM settings - WHERE value='RecordFilePrefix' AND hostname='%s' + SELECT * FROM settings + WHERE value='RecordFilePrefix' AND hostname='%s' """ % socket.gethostname()) recordingsdir = cursor.fetchone()["data"] # Now find all the recordings we have at the moment cursor.execute(""" - SELECT title, subtitle, starttime, basename, watched FROM recorded + SELECT title, subtitle, starttime, basename, watched FROM recorded """) for row in cursor: - title = row["title"] - starttime = str(row["starttime"]).replace(":", "-") - subtitle = row["subtitle"] - basename = row["basename"] - watched = bool(row["watched"]) + title = row["title"] + starttime = str(row["starttime"]).replace(":", "-") + subtitle = row["subtitle"] + basename = row["basename"] + watched = bool(row["watched"]) - title = unsafe.sub("", title) - subtitle = unsafe.sub("", subtitle) - extn = os.path.splitext(basename)[1] + title = unsafe.sub("", title) + subtitle = unsafe.sub("", subtitle) + extn = os.path.splitext(basename)[1] - if subtitle: - filename = "%s - %s%s" % (starttime, subtitle, extn) - else: - filename = "%s%s" % (starttime, extn) - if watched: - filename = "watched/" + filename + if subtitle: + filename = "%s - %s%s" % (starttime, subtitle, extn) + else: + filename = "%s%s" % (starttime, extn) + if watched: + filename = "watched/" + filename - source = "%s/%s" % (recordingsdir, basename) - dest = "%s/%s" % (title, filename) + source = "%s/%s" % (recordingsdir, basename) + dest = "%s/%s" % (title, filename) - if not os.path.isfile(source): - continue + if not os.path.isfile(source): + continue - dirnames = dest.split("/")[:-1] - for i in xrange(1, len(dirnames)+1): - dirname = "/".join(dirnames[:i]) - if not os.path.isdir(dirname): - os.mkdir(dirname) + dirnames = dest.split("/")[:-1] + for i in xrange(1, len(dirnames)+1): + dirname = "/".join(dirnames[:i]) + if not os.path.isdir(dirname): + os.mkdir(dirname) - os.symlink(source, dest) + os.symlink(source, dest) -- 2.39.2