diff --git a/url-normalise b/url-normalise
index 6ba8c2f..fff05a7 100755
--- a/url-normalise
+++ b/url-normalise
@@ -47,6 +47,14 @@ do
url="${line}"
fi
+ if [[ "${url}" == *' | '* ]]
+ then
+ suffix=" | ${url#* | }"
+ url="${url%% | *}"
+ else
+ suffix=""
+ fi
+
if [[ "${url}" =~ ^https?://((www|m|[a-z][a-z]-[a-z][a-z]).)?facebook.com/login/.*[?\&]next=https?%3A%2F%2F((www|m|[a-z][a-z]-[a-z][a-z]).)?facebook.com%2F && "${url}" != *'%0A'* && "${url}" != *'%00'* ]]
then
url="${url##*\?next=}"
@@ -67,7 +75,7 @@ do
user="$(grep -Po '
]*(?<=\s)data-key\s*=\s*"tab_home".*?
' <<< "${page}" | grep -Po ']*(?<=\s)href="/\K[^/]+')"
if [[ "${user}" ]]
then
- echo "${prefix}https://www.facebook.com/${user}/"
+ echo "${prefix}https://www.facebook.com/${user}/${suffix}"
continue
elif grep -q 'id="pagelet_loggedout_sign_up"' <<< "${page}"
then
@@ -76,7 +84,7 @@ do
user="$(grep -Po '&2
echo "${line}"
@@ -113,7 +121,7 @@ do
verbose_echo "Normalising Instagram URL: ${url}" >&2
user="${url%/}"
user="${user##*/}"
- echo "${prefix}https://www.instagram.com/${user,,}/"
+ echo "${prefix}https://www.instagram.com/${user,,}/${suffix}"
elif [[ "${url}" =~ ^https?://(www\.)?youtube\.com/ ]]
then
verbose_echo "Normalising YouTube URL: ${url}" >&2
@@ -127,12 +135,12 @@ do
canonical="$(grep -Po '&2
echo "${line}"
@@ -143,7 +151,7 @@ do
canonical="$(curl -sS ${otherCurlRedirectOpt} --max-time 10 -A "${userAgent}" -o /dev/null -w '%{url_effective}' "${url}")"
if [[ "${canonical}" ]]
then
- echo "${prefix}${canonical}"
+ echo "${prefix}${canonical}${suffix}"
else
echo "Failed to normalise other URL: ${url}" >&2
echo "${line}"