fix stuff

crawl.py

@@ -52,7 +52,7 @@ def rollingFiles():
 
         isDL()
         idTorrent = os.popen('./lib/scrabash.sh get_details ' + research).read()
-        dbPath = "./data/nfo/{}/db.py".format(idTorrent.rstrip())
+        dbPath = "./data/meta/{}/db.py".format(idTorrent.rstrip())
         torrentDB = os.popen('cat ' + dbPath).read()
 
         print(torrentDB)

lib/scrabash.sh

@@ -3,40 +3,27 @@
 # Config
 print=true
 
-name="${@:2}"
-nameR=$(echo $name | sed -e 's/[^ ]*=[^ ]*//ig')
-
 ## Get options
+cmd="$1"
 args="${@:2}"
+name=$(echo "$args" | sed -e 's/[^ ]*=[^ ]*//ig')
+
 [[ $args =~ "--best=true" ]] && best=true
 [[ $args =~ "--print=true" ]] && print=true
 
 search() {
-	result=$(./lib/py/scrapactions.py $1 $name | jq .[] 2>&1 | tr -d '"')
-	[[ $result =~ "parse error: Invalid " ]] && echo "$nameR: No torrent found" && err=1 && exit 1
+	result=$(./lib/py/scrapactions.py $cmd $name | jq .[] 2>&1 | tr -d '"')
+	[[ $result =~ "parse error: Invalid " ]] && echo "$name: No torrent found" && err=1 && exit 1
 	[[ $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"
+	result=$(./lib/py/scrapactions.py $cmd $name | grep -v "Login success")
 
 	idTorrent=$(echo "$name" | awk -F '/' '{print $NF}' | awk -F '-' '{ print $1 }')
 	if [[ $print == true ]]; then
-                [[ ! -d data/$idTorrent ]] && mkdir data/$idTorrent
-                cd data/$idTorrent
+                [[ ! -d data/meta/$idTorrent ]] && mkdir data/meta/$idTorrent
+                cd data/meta/$idTorrent
 
 		echo "$result" > info.txt
 
@@ -45,6 +32,7 @@ get_details() {
 		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)
+		##TODO kopa add FilesLocations
 
 		if [[ $Size =~ "Go" ]]; then
 			Unity="Go"
@@ -59,7 +47,6 @@ get_details() {
 		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
@@ -67,6 +54,6 @@ get_details() {
 	fi
 }
 
-$1 $name
+$1
 
 [[ $err == 1 ]] && exit 1 || exit 0

requirements.txt

@@ -1,8 +0,0 @@
-requests
-json
-sys
-subprocess
-login
-time
-re
-