1 files changed, 69 insertions, 37 deletions
diff --git a/randoweb.py b/randoweb.py
index 5955f14..3957ef1 100644
--- a/randoweb.py
+++ b/randoweb.py
@@ -1,14 +1,23 @@
+# -*- coding: utf-8 -*-
 from requests import session
 import inputs
 from bs4 import BeautifulSoup as bs
 import colorcode as clc
 import errmsg as e
 import mapsparsing as mpp
-
-
-
-    
+randonb=[]
+a_str="eh"
+baseurl='https://randopitons.re/randonnee/'
     
+def filei(dwnld,bfn):
+    try:
+        f=open(bfn,'a+')
+        gudencoding=dwnld.text.encode('utf-8')
+        f.write(gudencoding)
+        f.close()
+    except:
+        raise
+
 def randoweb(MAIL,PSW,region,maptype,bfn):
     payload = {
         'mail': MAIL,
@@ -18,39 +27,62 @@ def randoweb(MAIL,PSW,region,maptype,bfn):
     with session() as c:
         
         try:
-            post('https://randopitons.re/connexion', data=payload)
-            region = c.get('https://randopitons.re/randonnees/region/'+region)
-            wsite=bs(region)
-            for i in wsite.find_all('tr'):
-                randonb.append(i.get("rid"))
-        except SSLError, sslerr:
-            print e.sslerr
-                
-        try:
-            for i in randonb:
-                dwnld="all the interwebz"
-                if maptype==1:
-                    dwnld = c.get('https://randopitons.re/randonnee/'+i+'/trace/gpx')
-                    gpxf=open(bfn,'a+')
-                elif maptype==2:
-                    dwnld = c.get('https://randopitons.re/randonnee/'+i+'/trace/kml')
-                    gpxf=open(bfn,'a+')
-                else:
-                    dwnld = c.get('https://randopitons.re/randonnee/'+i+'/trace/trk')
-                    gpxf=open(bfn,'a+')
-                    
-                gudencoding=dwnld.text.encode('utf-8')
-                gpxf.write(gudencoding)
-                gpxf.close()
+            c.post('https://randopitons.re/connexion', data=payload)
+            regionpage = c.get('https://randopitons.re/randonnees/region/'+region)
+            try:
+                wsite=bs(regionpage.text, "lxml")
+                print "Voici les donnees:"+regionpage.text
+            except:
+                raise
+            try:
+                for i in wsite.find_all('tr'):
+                    randonb.append(i.get("rid"))
+                try:
+                    randonb.pop(0)
+                    print "POPPED"
+                except:
+                    raise
+                print "Voici les numéros de randos:"
+                print randonb
+            except:
+                raise
             
-            mpp.mapparsing(maptype,bfn)    
-            print("Finished writing files.")
-        except OSError, er:
-            print e.os
-            print format(er)
-        
-        
+            
+            
+            try:
+                for i in randonb:
+                    if maptype==1:
+                        try:
+                            dwnld = c.get(baseurl+i+'/trace/gpx')
+                        except TypeError:
+                            pass
+                        except:
+                            raise
+                        filei(dwnld,bfn)
+                    elif maptype==2:
+                        try:
+                            dwnld = c.get(baseurl+i+'/trace/kml')
+                        except TypeError:
+                            pass
+                        except:
+                            raise
+                        filei(dwnld,bfn)
+                    else:
+                        try:
+                            dwnld = c.get(baseurl+i+'/trace/trk')
+                        except TypeError:
+                            pass
+                        except:
+                            raise
+                        filei(dwnld,bfn)
+            except:
+                raise   
+            try:
+                mpp.mapparsing(maptype,bfn)
+            except:
+                raise
+            print("Finished writing file.")
+        except :
+            raise
 
-#print(response.headers)
-#print(response.text)