diff --git a/.gitignore b/.gitignore index 13a60ab..951fe8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -data/files/* -data/torrents/* -data/nfo/* +data/* __pycache__/ yggcrawl/__pycache__/ yggcrawl/__init__.pyc diff --git a/crawl.py b/crawl.py index 1ff176c..6aba895 100755 --- a/crawl.py +++ b/crawl.py @@ -29,6 +29,7 @@ from yggtorrentscraper import set_yggtorrent_tld set_yggtorrent_tld("se") name = ' '.join(sys.argv[1:]) +print("ok") # Search torrent name research = os.popen('./lib/scrabash.sh search --best=true ' + name).read() print(colored(research, 'yellow')) diff --git a/data/nfo/.gitkeep b/data/nfo/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/lib/scrabash.sh b/lib/scrabash.sh index 5b21cec..60140af 100755 --- a/lib/scrabash.sh +++ b/lib/scrabash.sh @@ -17,37 +17,56 @@ search() { [[ $best == true ]] && echo "$result" | head -n1 || echo "$result" } +get_images() { + [[ -z $name ]] && echo "Please choose a torrent url" && exit 1 + idTorrent=$(echo "$name" | awk -F '/' '{print $NF}' | awk -F '-' '{ print $1 }') + mkdir $idTorrent + cd $idTorrent + + wget -q -r -np -nd -k "$1" + url=$(cat * | awk -v RS=' ' '/.jpg/' | awk -F '"' '{ print $2 }' | head -n1) + + curl -s -O $url +} + get_details() { result=$(./lib/py/scrapactions.py $1 $name | grep -v "Login success") # echo "$result" idTorrent=$(echo "$name" | awk -F '/' '{print $NF}' | awk -F '-' '{ print $1 }') if [[ $print == true ]]; then - [[ ! -d data/nfo/$idTorrent ]] && mkdir data/nfo/$idTorrent - echo "$result" > ./data/nfo/$idTorrent/info.txt + [[ ! -d data/$idTorrent ]] && mkdir data/$idTorrent + cd data/$idTorrent + + echo "$result" > info.txt torrentName=$(echo "$result" | grep -w "Name :" | awk -F ": " '{ print $2 }') - torrentUrl=$(echo "$result" | grep -w "Url :" | awk -F ": " '{ print $2 }') - torrentSize=$(echo "$result" | grep -w "Size :" | awk -F ": " '{ print $2 }') - if [[ $torrentSize =~ "Go" ]]; then - unity="Go" + Url=$(echo "$result" | grep -w "Url :" | awk -F ": " '{ print $2 }') + Size=$(echo "$result" | grep -w "Size :" | awk -F ": " '{ print $2 }') + Uploader=$(echo "$result" | grep -w "Uploader :" | awk -F ": " '{ print $2 }') + Files=$(echo "$result" | grep -w "file_name :" | awk -F ": " '{ print $2 }' | wc -l) + + if [[ $Size =~ "Go" ]]; then + Unity="Go" else - unity="Mo" + Unity="Mo" fi - torrentSize=$(echo "$torrentSize" | tr -d 'Go') - torrentSeeders=$(echo "$result" | grep -w "Seeders :" | awk -F ": " '{ print $2 }') + Size=$(echo "$Size" | tr -d 'Go') + Seeders=$(echo "$result" | grep -w "Seeders :" | awk -F ": " '{ print $2 }') echo "$idTorrent" - echo "Name = '$torrentName' -Url = '$torrentUrl' -Size = $torrentSize -Unity = '$unity' -Seeders = $torrentSeeders -ID = $idTorrent" > ./data/nfo/$idTorrent/db.py + echo -e "Name = '$torrentName'\nUrl = '$Url'\nSize = $Size\nUnity = '$Unity'\nID = $idTorrent\nUploader = $Uploader\nFiles = $Files" > db.py + + # Get image + + [[ ! -d img ]] && mkdir img && cd img + url=$(wget -qO- -np -nd $name | awk -v RS=' ' '/.jpg/' | awk -F '"' '{ print $2 }' | head -n1) + curl -s -O $url + fi } -$1 $1 +$1 $name [[ $err == 1 ]] && exit 1 || exit 0 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..ffd02bd --- /dev/null +++ b/requirements.txt @@ -0,0 +1,8 @@ +requests +json +sys +subprocess +login +time +re + diff --git a/yggcrawl/yggtorrentscraper.py b/yggcrawl/yggtorrentscraper.py index 27aea80..182eec1 100644 --- a/yggcrawl/yggtorrentscraper.py +++ b/yggcrawl/yggtorrentscraper.py @@ -162,7 +162,6 @@ class YggTorrentScraper: def search(self, parameters): search_url = create_search_url(parameters) - torrents_url = self.get_torrents_url(search_url, parameters) return torrents_url