Introduce private folders (also minor changes to extrusion docs)

Author: BruceSherwood

docs/GlowScriptDocs/extrusion.html

@@ -89,8 +89,8 @@
             </div>
             <p class="Normal">The extrusion object is rendered quite rapidly, so unusual effects are possible. An extrusion object is treated like a compound object, and you can dynamically change its pos (a vector), axis, size, color, and up attributes, as with other objects.</p>
             <p class="Normal"><strong><font color="#0000a0">How the extrusion machinery works</font></strong></p>
-            <p class="Normal">At every point along the <span class="attribute">pos</span> path this point plus the preceding and following points define a plane. A 2D plane is established perpendicular to the tangent to the circle at this point. The 2D shape is drawn in this 2D plane. A shape should be positioned so that its center is approximately at the location of the <span class="attribute">pos</span> locations. If you offset the shape far from the path, you may get odd results, because there is enhanced danger of two adjacent drawing planes  intersecting each other. Also, making sharp turns of wide extrusions may lead to one segment overlapping another. </p>
-            <p class="Normal">If the bending angle from one point to the next is large, the fitted circle is abandoned, and the orientation of the 2D plane is determined from the direction from the previous point to the current point and the direction from the current point to the next point, giving a mitered joint. The bending angle is considered to be large if its cosine if greater than 0.95 (an angle of about 18 degrees). </p>
+            <p class="Normal">At every point along the <span class="attribute">pos</span> path this point plus the preceding and following points define a plane. A 2D plane is established perpendicular to the tangent to the path at this point. The 2D shape is drawn in this 2D plane. A shape should be positioned so that its center is approximately at the location of the <span class="attribute">pos</span> locations. If you offset the shape far from the path, you may get odd results, because there is enhanced danger of two adjacent drawing planes  intersecting each other. Also, making sharp turns of wide extrusions may lead to one segment overlapping another. </p>
+            <p class="Normal">If the bending angle from one point to the next is large,  a mitered joint is produced. The bending angle is considered to be large if its cosine if greater than 0.95 (an angle of about 18 degrees). </p>
           </div>
           <div></div>
       </div>

docs/VPythonDocs/extrusion.html

@@ -93,8 +93,8 @@
         </div>
 <p class="Normal">The extrusion object is rendered quite rapidly, so unusual effects are possible. An extrusion object is treated like a compound object, and you can dynamically change its pos (a vector), axis, size, color, and up attributes, as with other objects.</p>
 <p class="Normal"><strong><font color="#0000a0">How the extrusion machinery works</font></strong></p>
-            <p class="Normal">At every point along the <span class="attribute">pos</span> path this point plus the preceding and following points define a plane. A 2D plane is established perpendicular to the tangent to the circle at this point. The 2D shape is drawn in this 2D plane. A shape should be positioned so that its center is approximately at the location of the <span class="attribute">pos</span> locations. If you offset the shape far from the path, you may get odd results, because there is enhanced danger of two adjacent drawing planes  intersecting each other. Also, making sharp turns of wide extrusions may lead to one segment overlapping another. </p>
-            <p class="Normal">If the bending angle from one point to the next is large, the fitted circle is abandoned, and the orientation of the 2D plane is determined from the direction from the previous point to the current point and the direction from the current point to the next point, giving a mitered joint. The bending angle is considered to be large if its cosine if greater than 0.95 (an angle of about 18 degrees). </p>
+            <p class="Normal">At every point along the <span class="attribute">pos</span> path this point plus the preceding and following points define a plane. A 2D plane is established perpendicular to the tangent to the path at this point. The 2D shape is drawn in this 2D plane. A shape should be positioned so that its center is approximately at the location of the <span class="attribute">pos</span> locations. If you offset the shape far from the path, you may get odd results, because there is enhanced danger of two adjacent drawing planes  intersecting each other. Also, making sharp turns of wide extrusions may lead to one segment overlapping another. </p>
+            <p class="Normal">If the bending angle from one point to the next is large,  a mitered joint is produced. The bending angle is considered to be large if its cosine if greater than 0.95 (an angle of about 18 degrees). </p>
         </div>
         <div></div>
       </div>

ide/api.py

@@ -176,7 +176,9 @@ def put(self, username):
         db_user = User( key_name = username, gaeUser = gaeUser, secret = base64.urlsafe_b64encode(os.urandom(16)) )
         db_user.put()
 
-        db_my_programs = Folder( parent = db_user, key_name = "My%20Programs", public=True )
+        db_my_programs = Folder( parent = db_user, key_name = "Public", isPublic=True )
+        db_my_programs.put()
+        db_my_programs = Folder( parent = db_user, key_name = "Private", isPublic=False )
         db_my_programs.put()
 
         #self.redirect( "/api/login" ) # routing now done in ide.js
@@ -187,8 +189,13 @@ def get(self, user):                                                        ####
         user = m.group(1)
         if not self.authorize(): return
         if not self.validate(user): return
-        # TODO: If user is not authorized, return only public folders
-        folders = [ k.name() for k in Folder.all(keys_only=True).ancestor(db.Key.from_path("User",user)) ]
+        gaeUser = users.get_current_user()
+        db_user = User.get( db.Key.from_path("User",user) )
+        folders = []
+        for k in Folder.all().ancestor(db.Key.from_path("User",user)):
+        	if k.isPublic != None and not k.isPublic and gaeUser != db_user.gaeUser: continue
+        	folders.append(k.key().name())
+        #folders = [ k.name() for k in Folder.all(keys_only=True).ancestor(db.Key.from_path("User",user)) ]
         self.respond( {"user" : user, "folders" : folders} )
 
 class ApiUserFolder(ApiRequest):
@@ -201,13 +208,13 @@ def put(self, user, folder):                                                ####
         db_user = User.get( db.Key.from_path("User",user) )
         if not db_user:
             return self.error(404)
-        #import cgi
-        #params = cgi.parse_qs(self.request.body)
-        #req_program = params['program'][0]
-        #changes = json.loads( req_program )
-        #folder = Folder( parent = db_user, key_name = folder, isPublic = changes['public'] )
+        import cgi
+        params = cgi.parse_qs(self.request.body)
+        req_program = params['program'][0]
+        changes = json.loads( req_program )
+        folder = Folder( parent = db_user, key_name = folder, isPublic = changes['public'] )
         ### Also change public=True in My Programs, above
-        folder = Folder( parent = db_user, key_name = folder, public=True )
+        #folder = Folder( parent = db_user, key_name = folder, public=True )
         folder.put()
 
     def delete(self, user, folder):                                             ##### delete an existing folder
@@ -232,14 +239,15 @@ def get(self, user, folder):                                                ####
         folder = m.group(2)
         if not self.authorize(): return
         if not self.validate(user, folder): return
-        # TODO: Check that folder exists!
-        # TODO: Check that folder is public or user is authorized
-        #db_folder = Folder.get(db.Key.from_path("User",user,"Folder",folder))
-        #try:
-        #	pub = db_folder.isPublic # before March 2015, isPublic wasn't set
-        #except:
-        #	pub = True
-        #if not pub: return
+        db_folder = Folder.get(db.Key.from_path("User",user,"Folder",folder))
+        gaeUser = users.get_current_user()
+        db_user = User.get( db.Key.from_path("User",user) )
+        try:
+        	pub = db_folder.isPublic is None or db_folder.isPublic or gaeUser == db_user.gaeUser # before March 2015, isPublic wasn't set
+        except:
+        	pub = True
+        if not pub:
+            return self.error(405)
         programs = [
             { "name": p.key().name(),
               "description": unicode(p.description or unicode()),
@@ -255,11 +263,18 @@ def get(self, user, folder, name):                                          ####
         name = m.group(3)
         if not self.authorize(): return
         if not self.validate(user, folder, name): return
-        # TODO: Check that folder is public or user is authorized
+        db_folder = Folder.get(db.Key.from_path("User",user,"Folder",folder))
+        gaeUser = users.get_current_user()
+        db_user = User.get( db.Key.from_path("User",user) )
+        try:
+        	pub = db_folder.isPublic is None or db_folder.isPublic or gaeUser == db_user.gaeUser # before March 2015, isPublic wasn't set
+        except:
+        	pub = True
+        if not pub:
+            return self.error(405)
         db_program = Program.get( db.Key.from_path("User",user,"Folder",folder,"Program",name) )
         if not db_program:
-            self.error(404)
-            return
+            return self.error(404)
         self.respond( {"user":user,"folder":folder,"name":name,
             "description": unicode(db_program.description or unicode()),
             "screenshot": str(db_program.screenshot or ""),

ide/ide.js

@@ -112,6 +112,7 @@ $(function () {
     }
     function apiGet(route, callback) {
         var url = apiURL(route)
+    	console.log(url, route)
         $.ajax({
             type: 'GET',
             url: url,
@@ -587,9 +588,12 @@ $(function () {
             for (var i = 0; i < folders.length; i++) {
                 var h = folderTemplate.clone().removeClass("template").addClass("templated")
                 var name = decode(folders[i])
+                console.log(name, folder)
                 if (name == folder) h.addClass("ui-tabs-active").addClass("ui-state-active")
+                console.log(username, name)
                 h.find(".folder-name").text(name).prop("href", unroute({page:"folder", user:username, folder:name}))
                 h.insertBefore(before)
+                console.log(h)
             }
         })
 

ide/index.html

@@ -159,7 +159,7 @@ <h2>G l o w S c r i p t&nbsp&nbsp 1.1</h2>
         <label for="name">Name</label>
         <input type="text" name="name" class="text ui-widget-content ui-corner-all" />
         <label for="isPublic">Public</label>
-        <input type="checkbox" name="isPublic" disabled="disabled" checked="checked"/>
+        <input type="checkbox" name="isPublic" checked="checked"/>
     </form>
 </div>