Changeset 760:733c148959e9 for src/mlx/web.py

Timestamp:

02/14/16 09:17:27 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The rank is returned when logging in, and in case of a student, we jump to the student page

File:

• src/mlx/web.py (modified) (6 diffs)

src/mlx/web.py

@@ -659 +659 @@
     iso88592decoder = codecs.getdecoder("iso-8859-2")
 
-    def __init__(self, callback, pilotID, password, entranceExam):
+    def __init__(self, callback, pilotID, password):
         """Construct the login request with the given pilot ID and
         password."""
@@ -666 +666 @@
         self._pilotID = pilotID
         self._password = password
-        self._entranceExam = entranceExam
 
     def run(self):
@@ -678 +677 @@
         password = md5.hexdigest()
 
-        if self._entranceExam:
-            url = MAVA_BASE_URL + "/ellenorzo/getflightplan.php?pid=%s" % \
-                  (pilotID,)
-        else:
-            url = MAVA_BASE_URL + "/leker2.php?pid=%s&psw=%s" % \
-                  (pilotID, password)
+        url = MAVA_BASE_URL + "/leker2.php?pid=%s&psw=%s" %  (pilotID, password)
 
         result = Result()
-        result.entranceExam = self._entranceExam
 
         f = urllib2.urlopen(url, timeout = 10.0)
 
         status = readline(f)
-        if self._entranceExam:
-            result.loggedIn = status != "#NOEXAM"
-        else:
-            result.loggedIn = status == ".OK."
+        result.loggedIn = status == ".OK."
 
         if result.loggedIn:
             result.pilotID = self._pilotID
             result.password = self._password
+            result.rank = "FO"
             result.flights = []
-            # FIXME: this may not be the correct behaviour
-            # for an entrance exam, but the website returns
-            # an error
-            if self._entranceExam:
-                result.pilotName = result.pilotID
-                result.exams = ""
-            else:
-                result.pilotName = self.iso88592decoder(readline(f))[0]
-                result.exams = readline(f)
-
-                while True:
-                    line = readline(f)
-                    if not line or line == "#ENDPIREP": break
-
-                    flight = BookedFlight(line)
-                    flight.readFromWeb(f)
-                    result.flights.append(flight)
+
+            result.pilotName = self.iso88592decoder(readline(f))[0]
+            result.exams = readline(f)
+
+            while True:
+                line = readline(f)
+                if not line or line == "#ENDPIREP": break
+
+                flight = BookedFlight(line)
+                flight.readFromWeb(f)
+                result.flights.append(flight)
 
             result.flights.sort(cmp = lambda flight1, flight2:
@@ -730 +715 @@
 class LoginRPC(RPCRequest):
     """An RPC-based login request."""
-    def __init__(self, client, callback, pilotID, password, entranceExam):
+    def __init__(self, client, callback, pilotID, password):
         """Construct the login request with the given pilot ID and
         password."""
@@ -737 +722 @@
         self._pilotID = pilotID
         self._password = password
-        self._entranceExam = entranceExam
 
     def run(self):
         """Perform the login request."""
         result = Result()
-        # FIXME: handle the entrance exam case
-        result.entranceExam = self._entranceExam
 
         self._client.setCredentials(self._pilotID, self._password)
-        pilotName = self._client.login()
-        result.loggedIn = pilotName is not None
+        loginResult = self._client.login()
+        result.loggedIn = loginResult is not None
         if result.loggedIn:
             result.pilotID = self._pilotID
-            result.pilotName = pilotName
+            result.pilotName = loginResult[0]
+            result.rank = loginResult[1]
             result.password = self._password
             result.flights = self._client.getFlights()
@@ -1170 +1153 @@
         self._addRequest(Register(self._rpcClient, callback, registrationData))
 
-    def login(self, callback, pilotID, password, entranceExam = False):
+    def login(self, callback, pilotID, password):
         """Enqueue a login request."""
         request = \
-          LoginRPC(self._rpcClient, callback, pilotID, password, entranceExam) \
-          if self._config.useRPC and not entranceExam \
-          else Login(callback, pilotID, password, entranceExam)
+          LoginRPC(self._rpcClient, callback, pilotID, password) \
+          if self._config.useRPC else Login(callback, pilotID, password)
 
         self._addRequest(request)