Showing 1 changed files with 9 additions and 16 deletions
+9 -16
serie-vostfr.com
... ...
@@ -12,16 +12,6 @@ TEMPCOOKIE="$BASE.cookie"
12 12
 TEMPJS="$BASE.js"
13 13
 TEMPJSON="$BASE.json"
14 14
 RCFILE="$HOME/.$BASE""rc"
15
-if [ 0 -eq $DEBUG ]
16
-then
17
-	DATE=$(date +%s)
18
-	TEMPHTML="$BASE-$DATE.html"
19
-	TEMPHTML2="$BASE.2-$DATE.html"
20
-	TEMPHTML3="$BASE.3-$DATE.html"
21
-	TEMPCOOKIE="$BASE-$DATE.cookie"
22
-	TEMPJS="$BASE-$DATE.js"
23
-	TEMPJSON="$BASE-$DATE.json"
24
-fi
25 15
 
26 16
 WGET_CMD="wget -q --no-check-certificate --keep-session-cookies --load-cookies $TEMPCOOKIE --save-cookies $TEMPCOOKIE"
27 17
 WGET_CMD_VERBOSE="wget --no-check-certificate --keep-session-cookies --load-cookies $TEMPCOOKIE --save-cookies $TEMPCOOKIE"
... ...
@@ -255,14 +245,13 @@ function parse_jheberg() {
255 245
 	$WGET_CMD_VERBOSE --header "$HDR_ACCEPT" --user-agent "$USER_AGENT" $NEWURL -O $TEMPHTML || die 2 "Error"
256 246
 }
257 247
 
258
-trap cleanfiles EXIT
248
+#~ trap cleanfiles EXIT
259 249
 
260 250
 ISURL=${URL:0:4}
261 251
 if [ "http" == "$ISURL" ]
262 252
 then
263 253
 	echo -n "+- Downloading $URL" 
264 254
 	$WGET_CMD --header "$HDR_ACCEPT" --user-agent "$USER_AGENT" $URL -O $TEMPHTML && echo " OK" || die 2 "Error"
265
-	#~ $WGET_CMD_VERBOSE --header "$HDR_ACCEPT" --user-agent "$USER_AGENT" $URL -O $TEMPHTML && echo " OK" || die 2 "Error"
266 255
 	LINE_START=$(grep -n 'TELECHARGEMENT' $TEMPHTML | awk -F':' '{print $1}')
267 256
 	LINE_STOP=$(cat $TEMPHTML|wc -l)
268 257
   
... ...
@@ -271,16 +260,20 @@ then
271 260
 		URL=$(grep 'ddl.serie-vostfr.com/includes.php' $TEMPHTML | sed 's/iframe /\niframe/g'|grep 'ddl.serie-vostfr.com/includes.php' | awk -F'"' '{print $4}')  
272 261
     if [ "$URL" == "" ]
273 262
     then
274
-      echo "+- Nested URL not found"
275
-      exit 0
263
+      URL=$(cat serie-vostfr.html | sed 's/http/\nhttp/g' | grep http | grep shorten | awk -F'"' '{print $1}')
264
+      if [ "$URL" == "" ]
265
+      then
266
+        echo "+- Nested URL not found"
267
+        exit 0
268
+      fi
276 269
     fi
277 270
 		echo -n "+- Nested $URL"
278 271
 		$WGET_CMD --header "$HDR_ACCEPT" --user-agent "$USER_AGENT" $URL -O $TEMPHTML && echo " OK" || die 2 "Error"	
279 272
 		LINE_START=$(grep -n 'TELECHARGEMENT' $TEMPHTML | awk -F':' '{print $1}')
280 273
 		LINE_STOP=$(cat $TEMPHTML|wc -l)
281 274
 	fi	
282
-	echo "+- Start @ [$LINE_START]"
283
-	echo "+- Stop  @ [$LINE_STOP]"
275
+	#~ echo "+- Start @ [$LINE_START]"
276
+	#~ echo "+- Stop  @ [$LINE_STOP]"
284 277
 	cat -v $TEMPHTML | sed -n "$LINE_START,$LINE_STOP"p > $TEMPHTML3
285 278
   grep href $TEMPHTML3 | sed 's/http/\nhttp/g'|grep http | awk '{print $1}' | sed 's/"//g;s/\^M//' | sed "s/'//g" > $TEMPHTML2
286 279
 else