diff --git a/README.md b/README.md index a452fd4..9f84ffc 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ - + # Yuba @@ -17,9 +17,9 @@ ## Screenshots - - - + + + ## Notes diff --git a/filetypes.php b/filetypes.php index 684f916..94fc6a1 100755 --- a/filetypes.php +++ b/filetypes.php @@ -75,7 +75,7 @@ $p['c_files'] = array( "DS_Store", // thumbnail bindings $p['t_f']['pdf'][] = "jpg"; -$p['t_f']['pdf'][] = array("qlmanage","sips","vips"); +$p['t_f']['pdf'][] = array("gs","qlmanage","sips","vips"); // Use ffmpeg to generate thumbnails for these files $p['t_files']['ffmpeg'] = array( "mkv", diff --git a/utils/IconTester.app/Contents/Resources/AppSettings.plist b/utils/IconTester.app/Contents/Resources/AppSettings.plist index 7dd99a5..855a74a 100644 Binary files a/utils/IconTester.app/Contents/Resources/AppSettings.plist and b/utils/IconTester.app/Contents/Resources/AppSettings.plist differ diff --git a/utils/IconTester.app/Contents/Resources/MainMenu.nib/keyedobjects.nib b/utils/IconTester.app/Contents/Resources/MainMenu.nib similarity index 100% rename from utils/IconTester.app/Contents/Resources/MainMenu.nib/keyedobjects.nib rename to utils/IconTester.app/Contents/Resources/MainMenu.nib diff --git a/utils/IconTester.app/Contents/Resources/MainMenu.nib/designable.nib b/utils/IconTester.app/Contents/Resources/MainMenu.nib/designable.nib deleted file mode 100644 index 3f936d4..0000000 --- a/utils/IconTester.app/Contents/Resources/MainMenu.nib/designable.nib +++ /dev/null @@ -1,711 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utils/IconTester.app/Contents/Resources/script b/utils/IconTester.app/Contents/Resources/script index 39cf706..cafdf65 100755 --- a/utils/IconTester.app/Contents/Resources/script +++ b/utils/IconTester.app/Contents/Resources/script @@ -2,6 +2,8 @@ // Yuba Preview Tester 0.1.2 +//print_r($argv); die; + $mode = $argv[1]; if (empty($argv[2])) { echo "Nothing dragged"; die; } @@ -57,11 +59,11 @@ if ($mode == "thumb") { $cmd['ql-thumbnail'][] = $bin_qlthumb." ".$shellpath." ".$tprefix."qlthumb.jpg public.jpeg ".$p['thumb_size']." ".$p['thumb_size']." .8"; $cmd['ql-thumbnail'][] = $tprefix."qlthumb.jpg"; - $cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o - | ".$bin_convert." - -crop 800x515+58+30 -scale 515x515! +dither -colors 16 ".$tprefix."sox.png"; + $cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o - | ".$bin_convert." - -crop 800x515+58+30 +dither -colors 16 ".$tprefix."sox.png"; //$cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o ".$tpfile."; ".$bin_sips." -s format jpeg -s formatOptions 80 ".escapeshellarg($tpfile)." --out ".$tprefix."sox.png"; $cmd['sox'][] = $tprefix."sox.png"; - $cmd['ffmpeg'][] = $bin_ffmpeg." -ss $(( $(".$bin_mediainfo." --Inform='Video;%Duration%' ".$shellpath." | cut -d'.' -f1) / 10000 )) -i ".$shellpath." -vframes 1 -filter:v scale='400:-1' -q:v 3 ".$tprefix."ffmpeg.jpg"; + $cmd['ffmpeg'][] = $bin_ffmpeg." -ss $(( $(".$bin_mediainfo." --Inform='Video;%Duration%' ".$shellpath." | cut -d'.' -f1) / 10000 )) -i ".$shellpath." -vframes 1 -filter:v scale='".$p['thumb_size'].":-2' -q:v 3 ".$tprefix."ffmpeg.jpg"; $cmd['ffmpeg'][] = $tprefix."ffmpeg.jpg"; } elseif ($mode == "icon") { @@ -95,7 +97,7 @@ foreach ($cmd as $exec) { $file = pathinfo($exec[1], PATHINFO_FILENAME); $dir = pathinfo($exec[1], PATHINFO_DIRNAME); - if(!filesize($exec[1])) { + if(!@filesize($exec[1])) { echo "NO RESULT\n"; } else { rename($exec[1],$dir."/".$i."_".$file."_".$elapsed."msec.".$ext); diff --git a/utils/ThumbTester.app/Contents/Resources/AppSettings.plist b/utils/ThumbTester.app/Contents/Resources/AppSettings.plist index c9e4295..c4f00eb 100644 Binary files a/utils/ThumbTester.app/Contents/Resources/AppSettings.plist and b/utils/ThumbTester.app/Contents/Resources/AppSettings.plist differ diff --git a/utils/ThumbTester.app/Contents/Resources/MainMenu.nib/keyedobjects.nib b/utils/ThumbTester.app/Contents/Resources/MainMenu.nib similarity index 100% rename from utils/ThumbTester.app/Contents/Resources/MainMenu.nib/keyedobjects.nib rename to utils/ThumbTester.app/Contents/Resources/MainMenu.nib diff --git a/utils/ThumbTester.app/Contents/Resources/MainMenu.nib/designable.nib b/utils/ThumbTester.app/Contents/Resources/MainMenu.nib/designable.nib deleted file mode 100644 index 3f936d4..0000000 --- a/utils/ThumbTester.app/Contents/Resources/MainMenu.nib/designable.nib +++ /dev/null @@ -1,711 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/utils/ThumbTester.app/Contents/Resources/script b/utils/ThumbTester.app/Contents/Resources/script index 39cf706..cafdf65 100755 --- a/utils/ThumbTester.app/Contents/Resources/script +++ b/utils/ThumbTester.app/Contents/Resources/script @@ -2,6 +2,8 @@ // Yuba Preview Tester 0.1.2 +//print_r($argv); die; + $mode = $argv[1]; if (empty($argv[2])) { echo "Nothing dragged"; die; } @@ -57,11 +59,11 @@ if ($mode == "thumb") { $cmd['ql-thumbnail'][] = $bin_qlthumb." ".$shellpath." ".$tprefix."qlthumb.jpg public.jpeg ".$p['thumb_size']." ".$p['thumb_size']." .8"; $cmd['ql-thumbnail'][] = $tprefix."qlthumb.jpg"; - $cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o - | ".$bin_convert." - -crop 800x515+58+30 -scale 515x515! +dither -colors 16 ".$tprefix."sox.png"; + $cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o - | ".$bin_convert." - -crop 800x515+58+30 +dither -colors 16 ".$tprefix."sox.png"; //$cmd['sox'][] = $bin_sox." ".$shellpath." -n trim 0 $(".$bin_exiftool." -s -s -s -duration# ".$shellpath." | awk '{print $1/10}') spectrogram -o ".$tpfile."; ".$bin_sips." -s format jpeg -s formatOptions 80 ".escapeshellarg($tpfile)." --out ".$tprefix."sox.png"; $cmd['sox'][] = $tprefix."sox.png"; - $cmd['ffmpeg'][] = $bin_ffmpeg." -ss $(( $(".$bin_mediainfo." --Inform='Video;%Duration%' ".$shellpath." | cut -d'.' -f1) / 10000 )) -i ".$shellpath." -vframes 1 -filter:v scale='400:-1' -q:v 3 ".$tprefix."ffmpeg.jpg"; + $cmd['ffmpeg'][] = $bin_ffmpeg." -ss $(( $(".$bin_mediainfo." --Inform='Video;%Duration%' ".$shellpath." | cut -d'.' -f1) / 10000 )) -i ".$shellpath." -vframes 1 -filter:v scale='".$p['thumb_size'].":-2' -q:v 3 ".$tprefix."ffmpeg.jpg"; $cmd['ffmpeg'][] = $tprefix."ffmpeg.jpg"; } elseif ($mode == "icon") { @@ -95,7 +97,7 @@ foreach ($cmd as $exec) { $file = pathinfo($exec[1], PATHINFO_FILENAME); $dir = pathinfo($exec[1], PATHINFO_DIRNAME); - if(!filesize($exec[1])) { + if(!@filesize($exec[1])) { echo "NO RESULT\n"; } else { rename($exec[1],$dir."/".$i."_".$file."_".$elapsed."msec.".$ext);