Merge branch 'master' of https://github.com/jorgevasquezp/my_scripts

bash/fix_wacom.sh

@@ -4,7 +4,5 @@
 #wacom_id="Wacom Intuos Pro M Pen stylus"
 #wacom_id=$(xsetwacom --list devices | grep stylus | grep -o [0-9]. | sed 's/\t//')
 wacom_id=$(xsetwacom --list devices | grep stylus | grep 'id\: [0-9].' -o | grep [0-9]. -o)
-xsetwacom --set "$wacom_id" button 2 3
-xsetwacom --set "$wacom_id" button 3 2
-
-
+xsetwacom --set "$(($wacom_id + 0))" button 2 3
+xsetwacom --set "$(($wacom_id + 0))" button 3 2

bash/get_wd.sh

@@ -0,0 +1,7 @@
+#/usr/bin/bash
+for i;
+	do 
+	link=$(curl $i | grep -o --color=auto 'http[^"]*\=view' | sed 's,\\,,g');
+	wget $link;
+	done
+for i in *mp4*; do mv $i ${i%\?*}; done

bash/make_doodle_grid.sh

@@ -0,0 +1,29 @@
+d=Detailed;
+s=Simple;
+bg_color=#77A6E4
+
+for i in $(ls $d)
+	do
+	new_image=./"${i%.*}.ppm"
+	new_simple_image=./"${i%.*}_simple.ppm"
+	convert ./$d/$i[0] -background $bg_color -flatten $new_image;
+	convert ./$s/${i%.*}_simple.psd[0] -background $bg_color -flatten $new_simple_image;
+	sidebyside=./"sidebyside_"${i%.*}.ppm
+	grid=$(basename $(pwd))".jpg"
+	montage -background "#77A6E4" -label "\n%t" -pointsize 10 -tile 1x2 -geometry 100 -geometry +0+0 -border 0 $new_image $new_simple_image $sidebyside
+	rm $new_image
+	rm $new_simple_image
+	done
+	
+montage -background "#77A6E4" -tile 10x10 -geometry +15+5 -border 1 sidebyside*ppm $grid
+rm *sidebyside*
+
+#for i in {Detailed,Simple};
+	#do
+		#for j in $(ls $i)
+			#do
+			#convert ./$i/$j[0] -background "#77A6E4" -flatten ./"${j%.*}.ppm";
+		#done
+		#make_grid.sh *ppm $(basename $(pwd))"$i.jpg";
+		#rm *ppm
+	#done

bash/make_grid.sh

@@ -7,7 +7,9 @@ filename=${@: -1}
 if [ -f $filename ]; then
    echo "Output $filename already exists."
 else
-   montage -label "\n%t" -pointsize 14 -tile 3x6 -geometry 550 -geometry +25+15 -border 1 $files $filename
+   #montage -label "\n%t" -pointsize 14 -tile 3x6 -geometry 550 -geometry +25+15 -border 1 $files $filename
+   #montage -background "#77A6E4" -label "\n%t" -pointsize 12 -tile 10x6 -geometry 120 -geometry +8+4 -border 1 $files $filename
+   montage -background "#77A6E4" -label "\n%t" -pointsize 12 -tile 10x6 -geometry 120 -geometry +8+4 -border 0 $files $filename
 fi
 
 

bash/make_today_folder.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/bash
+TODAY_FOLDER=$(date +"%m%d%y")
+if [ ! -d "$TODAY_FOLDER" ]; then
+  mkdir "$TODAY_FOLDER"
+fi

bash/ytdlpl.sh

@@ -1,8 +1,26 @@
+format=bestvideo+bestaudio
+format=22
+while getopts ":a" opt; do
+  case $opt in
+    a)
+      format=bestaudio
+      ;;
+    \?)
+      echo "Invalid option: -$OPTARG" >&2
+      ;;
+  esac
+done
+
 export IFS=$'\n';
 for i;
 	do 
-		#youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestaudio "$i"
-		youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestvideo+bestaudio "$i"
+		#Audio-->
+		youtube-dl -x --audio-format vorbis --add-metadata --xattrs --embed-subs --embed-thumbnail --all-subs -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -i -f bestaudio --audio-quality 192k "$i"
+		#youtube-dl --xattrs --embed-subs --embed-thumbnail --all-subs -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -i -f bestaudio "$i"
+		#youtube-dl -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f $a "$i"
+		#youtube-dl --add-metadata --xattrs --embed-subs --embed-thumbnail --all-subs -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -i -f bestvideo+bestaudio "$i"
+		#youtube-dl --add-metadata --xattrs --embed-subs --all-subs -o "%(playlist)s/%(playlist_index)s - %(title)s.%(ext)s" -f bestvideo+bestaudio "$i"
+		#VIDEO-->
+		#youtube-dl --add-metadata --xattrs --embed-subs --all-subs -o "%(playlist)s/%(playlist_index)s - %(title)s - %(format)s.%(ext)s" -i -f $format "$i"
+		
 done;
-
-