From 4129ca58d1e0a3969b050a5c0b77bd8fb7998fe4 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Fri, 11 Mar 2022 14:22:23 -0500
Subject: [PATCH] Update aliases

---
 aliases | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/aliases b/aliases
index 52d5948..0d3e539 100644
--- a/aliases
+++ b/aliases
@@ -383,9 +383,9 @@ dl_youtube_vid() {
     fi
 
     if [[ $shortname -eq 0 ]]; then
-        local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-youtube-%(id)s.%(ext)s"
+        local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s.%(ext)s"
     else
-        local name_format="%(upload_date>%Y-%m-%d)s-shortname-youtube-%(id)s.%(ext)s"
+        local name_format="%(upload_date>%Y-%m-%d)s-shortname-yt-%(id)s.%(ext)s"
     fi
 
     local cmd="yt-dlp.exe -f $format -o \"$name_format\" $opts $url"
@@ -427,7 +427,7 @@ dl_youtube_vid_and_hflip() {
         fi
     fi
 
-    local filename=$(yt-dlp.exe --get-filename -f $format -o "%(upload_date>%Y-%m-%d)s-%(title)s-youtube-%(id)s.%(ext)s" $url)
+    local filename=$(yt-dlp.exe --get-filename -f $format -o "%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s.%(ext)s" $url)
 
     local cmd="yt-dlp.exe -f $format -o \"$filename\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
@@ -471,7 +471,7 @@ dl_youtube_playlist() {
         fi
     fi
 
-    local cmd="yt-dlp.exe -f $format -o \"v%(playlist_index)03d--%(upload_date>%Y-%m-%d)s-%(title)s-youtube-%(id)s.%(ext)s\" $opts $url"
+    local cmd="yt-dlp.exe -f $format -o \"v%(playlist_index)03d--%(upload_date>%Y-%m-%d)s-%(title)s-yt-%(id)s.%(ext)s\" $opts $url"
     eval $cmd   # Need to eval in order to preserve the quotes wrapping the filename format string.
 
     # Removing any trailing subtitle files
@@ -509,7 +509,7 @@ dl_twitch_chat() {
         return
     fi
 
-    actually_dl_twitch_chat $url "$(yt-dlp.exe --get-filename -o "%(upload_date>%Y-%m-%d)s-%(title)s-twitch-%(id)s" $opts $url)"
+    actually_dl_twitch_chat $url "$(yt-dlp.exe --get-filename -o "%(upload_date>%Y-%m-%d)s-%(title)s-tw-%(id)s" $opts $url)"
 
     cd ..
 }
@@ -557,9 +557,9 @@ dl_twitch_vid() {
     fi
 
     if [[ $shortname -eq 0 ]]; then
-        local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-twitch-%(id)s"
+        local name_format="%(upload_date>%Y-%m-%d)s-%(title)s-tw-%(id)s"
     else
-        local name_format="%(upload_date>%Y-%m-%d)s-shortname-twitch-%(id)s"
+        local name_format="%(upload_date>%Y-%m-%d)s-shortname-tw-%(id)s"
     fi
 
     # Download Twitch chat transcript
@@ -735,7 +735,6 @@ alias yt-playlist-720='dl_youtube_playlist "136+140"'
 alias yt-playlist-tiny='dl_youtube_playlist "160+140"'
 alias yt-audio='yt-dlp.exe -f "140"'
 alias yt-and-hflip='dl_youtube_vid_and_hflip "137+140"' # 1080p
-alias ig-download-and-hflip='dl_instagram_vid_and_hflip '
 
 # Twitch Vid DL
 alias tw-src='dl_twitch_vid "Source" $SHORTNAME_OFF $COMPRESSION_OFF'
@@ -778,6 +777,9 @@ alias tw-source='dl_twitch_vid "Source" $SHORTNAME_OFF $COMPRESSION_OFF'
 alias vimeo='dl_vimeo_vid "Original" $SHORTNAME_OFF $COMPRESSION_OFF'
 alias vimeo-compressed='dl_vimeo_vid "Original" $SHORTNAME_OFF $COMPRESSION_ON'
 
+# Instagram Vid DL
+alias ig-download-and-hflip='dl_instagram_vid_and_hflip '
+
 # Misc
 alias download-mp4='dl_mp4'
 alias download-from-m3u8='dl_from_m3u8'