diff --git a/bin/tree-diff b/bin/tree-diff new file mode 120000 index 0000000..0fcdba6 --- /dev/null +++ b/bin/tree-diff @@ -0,0 +1 @@ +../files/tree-diff \ No newline at end of file diff --git a/files/image_list_tagger.py b/files/image_list_tagger.py index a44a020..5c41004 100755 --- a/files/image_list_tagger.py +++ b/files/image_list_tagger.py @@ -1,7 +1,8 @@ #!/usr/bin/env python import sys,os from Tkinter import * -import Image, ImageTk, math, ImageDraw +from PIL import Image,ImageTk, ImageDraw +import math from argparse import ArgumentParser import sqlite3 diff --git a/files/tree-diff b/files/tree-diff new file mode 100755 index 0000000..479ddb3 --- /dev/null +++ b/files/tree-diff @@ -0,0 +1,32 @@ +#!/bin/bash + +VERSION="20190214" + +function helpexit() { + BS=$( basename "$0" ) + echo "Diff the filenames and sizes in two folders" + echo "Usage: $BS [-v] folder1 folder2" + echo " -v view in vimdiff" + + exit +} +function _tree() { + tree -s -v "$1" +} + +VIMDIFF=0 +FOLDERS=( ) +for ((i=1; i<=${#@}; i++)) { + [[ "${!i}" = "-h" ]] && helpexit + [[ "${!i}" = "--help" ]] && helpexit + [[ "${!i}" = "-v" ]] && { VIMDIFF=1; continue; } + FOLDERS+=( "${!i}" ) +} +[[ ${#FOLDERS[@]} -eq 2 ]] || helpexit + +[[ "$VIMDIFF" -eq 1 ]] && { + vimdiff <( _tree "${FOLDERS[0]}" ) <( _tree "${FOLDERS[1]}" ) +} || { + diff -y <( _tree "${FOLDERS[0]}" ) <( _tree "${FOLDERS[1]}" ) | \ + HB_RULES='"|.*" "$c" ".*<" "$r" ">.*" "$g"' highbeam +}