Merge pull request #82 from pennlabs/laundry-android-fixes

Change the non-update status to -1, add underscores in high rise halls

Author: esqu1

penn/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.5.3'
+__version__ = '1.6.4'
 
 from .registrar import Registrar
 from .directory import Directory

penn/laundry.py

@@ -48,6 +48,8 @@ def create_hall_to_link_mapping(self):
         for hall in halls:
             hall_name = hall.contents[0].string
             hall_name = hall_name.replace("/", " ") # convert / to space
+            if hall_name.split()[0] in ["Harrison", "Harnwell", "Rodin"]:
+                hall_name = hall_name.replace(" ", "_", 1)
             self.hall_to_link[hall_name] = ALL_URL + hall.contents[0]['href']
             self.id_to_hall[str(counter)] = hall_name
             self.hall_id_list.append({"hall_name": hall_name, "id": counter})
@@ -73,7 +75,7 @@ def update_machine_object(cols, machine_object):
         # edge case that handles machine not sending time data
         diff = int(machine_object["running"]) - len(machine_object["time_remaining"])
         while diff > 0:
-            machine_object["time_remaining"].append("not updating status")
+            machine_object["time_remaining"].append(-1)
             diff = diff - 1
 
         return machine_object

setup.py

@@ -7,7 +7,7 @@
     url='https://github.com/pennlabs/penn-sdk-python',
     author='Penn Labs',
     author_email='admin@pennlabs.org',
-    version='1.6.3',
+    version='1.6.4',
     packages=['penn'],
     license='MIT',
     package_data={