Compare commits
No commits in common. "2184b8bf4016abe7c54cbad9dbec1a351a41aca6" and "079cec8402bafc20cddac7ff2013e131900c24dd" have entirely different histories.
2184b8bf40
...
079cec8402
52
.aliases
52
.aliases
|
|
@ -63,7 +63,6 @@ expand_path() {
|
|||
ret=$(readlink -m "$ret")
|
||||
echo $ret
|
||||
}
|
||||
|
||||
is_absolute_unix_path() {
|
||||
if [[ $1 =~ ^/ ]]; then echo 1; else echo 0; fi
|
||||
}
|
||||
|
|
@ -120,16 +119,6 @@ open_explorer_here() {
|
|||
fi
|
||||
}
|
||||
|
||||
remove_extra_spaces() {
|
||||
# Replace consecutive spaces with a single space.
|
||||
#
|
||||
# We're using this in the various vid/audio download functions because
|
||||
# Windows seems to strip extra spaces when creating a file, so we need
|
||||
# to match this behaviour in order to do post-processing after downloading.
|
||||
ret=$(echo "$1" | tr -s ' ')
|
||||
echo "$ret"
|
||||
}
|
||||
|
||||
##################
|
||||
# Building code
|
||||
##################
|
||||
|
|
@ -363,8 +352,6 @@ make_vid_dir_and_cd_into() {
|
|||
fi
|
||||
fi
|
||||
|
||||
dir_name=$(remove_extra_spaces "$dir_name")
|
||||
|
||||
printf "${BOLD}Creating directory ${YELLOW}'$dir_name'${NORMAL}\n"
|
||||
mkdir "$dir_name" 2>/dev/null
|
||||
cd "$dir_name"
|
||||
|
|
@ -479,10 +466,9 @@ download_youtube_vid() {
|
|||
|
||||
# Get the video filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the video.
|
||||
# Download
|
||||
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.
|
||||
error=$?
|
||||
|
|
@ -618,10 +604,8 @@ function download_youtube_audio() {
|
|||
|
||||
# Get the audio filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the audio.
|
||||
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.
|
||||
error=$?
|
||||
|
|
@ -641,7 +625,6 @@ function download_youtube_audio() {
|
|||
actually_download_twitch_chat() {
|
||||
local url="$1"
|
||||
local filename="$2"
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
|
||||
rechat.exe -d $url "$filename.json"
|
||||
if [[ -f "$filename.json" ]]; then
|
||||
|
|
@ -755,18 +738,16 @@ download_twitch_vid() {
|
|||
|
||||
# Get the video filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $yt_dlp_format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the video.
|
||||
# Download
|
||||
if [[ $subscriber_vod == "0" ]]; then
|
||||
printf "${YELLOW}${BOLD}\nUsing streamlink to download...${NORMAL}\n"
|
||||
local cmd="streamlink.exe --twitch-low-latency --twitch-disable-ads --twitch-disable-hosting --force --progress=force $opts $url $streamlink_format -O | ffmpeg -i pipe:0 -c copy \"$filename\""
|
||||
local cmd="streamlink.exe --twitch-low-latency --twitch-disable-ads --twitch-disable-hosting --force --force-progress $opts $url $streamlink_format -O | ffmpeg -i pipe:0 -c copy \"$filename\""
|
||||
else
|
||||
printf "${YELLOW}${BOLD}\nUsing yt-dlp to download...${NORMAL}\n"
|
||||
local cmd="yt-dlp.exe -f $yt_dlp_format -o \"$filename\" $opts $url"
|
||||
fi
|
||||
|
||||
printf "${YELLOW}${BOLD}Downloading video\n${NORMAL}"
|
||||
|
||||
eval $cmd # Need to eval in order to preserve the quotes wrapping the filename format string.
|
||||
error=$?
|
||||
|
||||
|
|
@ -778,9 +759,9 @@ download_twitch_vid() {
|
|||
|
||||
if [[ $compress == "1" ]]; then
|
||||
local temp_name="temp_${RANDOM}"
|
||||
extension="${filename##*.}"
|
||||
# 0=cpu, 1=gpu
|
||||
compress-video "$filename" "$temp_name" 0
|
||||
extension="${filename##*.}"
|
||||
mv "$filename" "orig_$filename"
|
||||
mv $temp_name.$extension "$filename"
|
||||
printf "${BOLD}Make sure to delete the original video file\n${NORMAL}"
|
||||
|
|
@ -837,12 +818,9 @@ download_vimeo_vid() {
|
|||
local name_format="%(upload_date>%Y-%m-%d)s-shortname-vimeo-%(id)s"
|
||||
fi
|
||||
|
||||
# Get the video filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the video.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $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.
|
||||
|
||||
|
|
@ -907,12 +885,9 @@ download_twitter_vid() {
|
|||
format="b"
|
||||
fi
|
||||
|
||||
# Get the video filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the video.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $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.
|
||||
|
||||
|
|
@ -959,12 +934,9 @@ download_instagram_vid() {
|
|||
|
||||
format="b" # best available
|
||||
|
||||
# Get the video filename.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $url)
|
||||
filename=$(remove_extra_spaces "$filename")
|
||||
printf "filename: $filename\n"
|
||||
|
||||
# Download the video.
|
||||
local filename=$(yt-dlp.exe --get-filename -f $format -o "$name_format.%(ext)s" $opts $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.
|
||||
|
||||
|
|
|
|||
|
|
@ -41,11 +41,6 @@
|
|||
127.0.0.1 mpa.autodesk.com #[Autodesk Analytics Client Service]
|
||||
127.0.0.1 sv.symcd.com #[Autodesk Download Manager]
|
||||
|
||||
# Dangerous polyfill
|
||||
|
||||
127.0.0.1 polyfill.io
|
||||
|
||||
|
||||
# Very invasive info tracker
|
||||
127.0.0.1 static.audienceinsights.net
|
||||
127.0.0.1 api.behavioralengine.com
|
||||
|
|
@ -15825,15 +15820,3 @@
|
|||
127.0.0.1 spynetalt.microsoft.com
|
||||
# End of en inserted by Spybot Anti-Beacon for Windows 10
|
||||
|
||||
# TailscaleHostsSectionStart
|
||||
# This section contains MagicDNS entries for Tailscale.
|
||||
# Do not edit this section manually.
|
||||
|
||||
100.69.212.80 gamma.sir-pinecone.github.beta.tailscale.net.
|
||||
100.69.212.80 gamma.taile86d5.ts.net. gamma
|
||||
100.105.152.57 quark.sir-pinecone.github.beta.tailscale.net.
|
||||
100.105.152.57 quark.taile86d5.ts.net. quark
|
||||
100.90.157.82 samsung-sm-s901w.sir-pinecone.github.beta.tailscale.net.
|
||||
100.90.157.82 samsung-sm-s901w.taile86d5.ts.net. samsung-sm-s901w
|
||||
|
||||
# TailscaleHostsSectionEnd
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user