Ticket #916: 0002-use-instead-of-hardcoding-the-home-dir-put-files.patch

src/jarabe/desktop/schoolserver.py

@@ -18 +18 @@
 from gettext import gettext as _
 from xmlrpclib import ServerProxy, Error
 import socket
-import os
+import os,os.path
 import gconf
 
 import string, random, time
@@ -31 +31 @@
 
 REGISTER_URL = 'http://schoolserver:8080/'
 
-# SoaS: ham@solutiongrove.com
-# defs to enable registration on SoaS
+# defs to enable registration of sugar to an xs on non-olpc hardware
 
 # utilities ********************************************************************
 
@@ -47 +46 @@
 # - we randomly get 3 letters
 # - concat the above with the last 8 numbers from epoch seconds
 
-def gen_soas_serial():
+def gen_identifier_serial():
   s1 = ''.join([random.choice(string.ascii_uppercase) for y in range(3)])
   s2 = str(int(getEpoch()))[-8:]
   serial = s1 + s2 
@@ -55 +54 @@
 
 # to create a unique uuid
 
-def gen_soas_uuid():
+def gen_identifier_uuid():
   u1_count = 40 
   uuid = ''.join([random.choice(string.hexdigits + '-') for y in range(int(u1_count))])
   return uuid
 
 # write serial and uuid to file ************************************************
 
-def write_soas_info(sn,uuid,backup_url):
-  # we presume that there is a /home/liveuser/.sugar directory
-  soas_dir = '/home/liveuser/.sugar/soas/'
+def write_identifier_info(sn,uuid,backup_url):
+  # get to the user's home where .sugar/default/ is
+  identifier_dir = os.path.expanduser('~') + '/.sugar/default/identifiers'
   # create the directory where we will put the files
-  if not os.path.exists(soas_dir):
-    os.mkdir(soas_dir)
+  if not os.path.exists(identifier_dir):
+    os.mkdir(identifier_dir)
   # check if a serial file exists, it might be from a failed registration
   # let's delete it first
-  if os.path.exists(os.path.join(soas_dir, 'sn')):
-    os.remove(os.path.join(soas_dir, 'sn'))
+  if os.path.exists(os.path.join(identifier_dir, 'sn')):
+    os.remove(os.path.join(identifier_dir, 'sn'))
   # write the serial into a file
-  serial_file = open(os.path.join(soas_dir, 'sn'),'w')
+  serial_file = open(os.path.join(identifier_dir, 'sn'),'w')
   serial_file.write(sn)
   serial_file.close()
   # check if a uuid file exists, it might be from a failed registration
   # let's delete it first
-  if os.path.exists(os.path.join(soas_dir, 'uuid')):
-    os.remove(os.path.join(soas_dir, 'uuid'))
+  if os.path.exists(os.path.join(identifier_dir, 'uuid')):
+    os.remove(os.path.join(identifier_dir, 'uuid'))
   # write the uuid into a file
-  uuid_file = open(os.path.join(soas_dir, 'uuid'),'w')
+  uuid_file = open(os.path.join(identifier_dir, 'uuid'),'w')
   uuid_file.write(uuid)
   uuid_file.close()
-  if os.path.exists(os.path.join(soas_dir, 'backup_url')):
-    os.remove(os.path.join(soas_dir, 'backup_url'))
+  if os.path.exists(os.path.join(identifier_dir, 'backup_url')):
+    os.remove(os.path.join(identifier_dir, 'backup_url'))
   # write the backup_url to a file
-  bu_file = open(os.path.join(soas_dir, 'backup_url'),'w')
+  bu_file = open(os.path.join(identifier_dir, 'backup_url'),'w')
   bu_file.write(backup_url)
   bu_file.close()
 
@@ -105 +104 @@
         # logging.error('Registration: Cannot obtain data needed to register.')
         # raise RegisterError(_('Cannot obtain data needed for registration.'))
 
-        # SoaS  :
         # if we did not find an ofw directory
         # let's generate the serial and uuid from the current time 
         # save the generated serial and uuid into files
 
-        sn = gen_soas_serial()
-        uuid = gen_soas_uuid()
+        sn = gen_identifier_serial()
+        uuid = gen_identifier_uuid()
 
         # we want to use the text in the jabber server as our registration url
 
@@ -119 +117 @@
 
         # we need to save sn and uuid to work with backups
 
-        write_soas_info(sn,uuid,JABBER_SERVER)
+        write_identifier_info(sn,uuid,JABBER_SERVER)
 
         # override the registration url to use