diff --git a/massdl.sh b/massdl.sh index caae8e5..80f0f05 100755 --- a/massdl.sh +++ b/massdl.sh @@ -33,7 +33,7 @@ if [[ ${@} == "" ]] ; then echo -ne "Примеры:\n\n\t./massdl.sh freeleech 316 — скачивание форума '*Nix Игры' от фрилич-пользователя\n\t./massdl.sh user 332 — скачивание форума 'Русский рок' от собственного, указанного в скрипте, имени\n\n" echo "Автор: Valdos 'fat0troll' Sine." echo "Основано на технологиях GNU." - echo "Версия 0.5" + echo "Версия 0.51" exit 0 else echo "Выполняется скрипт ${0}." @@ -85,7 +85,7 @@ THREADS=0 while [ `cat $TMPDIR/page$ITERATOR.html | iconv -f cp1251 -t utf-8 | grep "След."| grep 'start' | wc -l` == "2" ] do iconv -f cp1251 -t utf-8 $TMPDIR/page$ITERATOR.html > $TMPDIR/page$ITERATOR.utf8.html - cat $TMPDIR/page$ITERATOR.utf8.html | grep "DL:" | grep topictitle | sed 's/.*]*\).*/\1/' | cut -d '"' -f 2 >> $TMPDIR/alllinkz.txt + cat $TMPDIR/page$ITERATOR.utf8.html | grep "download.php" -B 2 | grep topictitle | sed 's/.*]*\).*/\1/' | cut -d '"' -f 2 >> $TMPDIR/alllinkz.txt THREADS=$(($THREADS + 50)) ITERATOR=$(($ITERATOR + 1)) START=$(($ITERATOR * 50)) @@ -94,7 +94,7 @@ do done # Last loop ending :) iconv -f cp1251 -t utf-8 $TMPDIR/page$ITERATOR.html > $TMPDIR/page$ITERATOR.utf8.html -cat $TMPDIR/page$ITERATOR.utf8.html | grep "DL:" | grep topictitle | sed 's/.*]*\).*/\1/' | cut -d '"' -f 2 >> $TMPDIR/alllinkz.txt +cat $TMPDIR/page$ITERATOR.utf8.html | grep 'download.php' -B 2 | grep topictitle | sed 's/.*]*\).*/\1/' | cut -d '"' -f 2 >> $TMPDIR/alllinkz.txt # Detecting subforums cat $TMPDIR/page0.utf8.html | grep viewforum | grep forumlink | grep -v "images" | cut -d '"' -f 14 | cut -d '=' -f 2 >> $TMPDIR/subforumz.txt @@ -117,10 +117,10 @@ echo -ne "Выявлено $THREADS топиков, содержащих тор # Torrents will be saved in folders like 100, 200, 300... Every folder contains # 100 torrents (except the last one). THREAD=0 -mkdir "$FORUMNAME" +mkdir "$FORUM-$FORUMNAME" while read line do - pushd "${FORUMNAME}" >> /dev/null + pushd "$FORUM-${FORUMNAME}" >> /dev/null mkdir "$(($THREAD / 100))" 2>> /dev/null THREAD=$(($THREAD + 1)) echo -ne "Скачиваем торрент $THREAD/$THREADS." @@ -194,4 +194,4 @@ if [[ "x$SUBFORUMSDL" == "x1" ]] ; then fi # Cleaning up... -rm -r $TMPDIR \ No newline at end of file +rm -r $TMPDIR