Ticket #33: 6.2.txt

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1


New patches:

[ticket #33: uploading private files.
Faried Nawaz <self@node.pk>**20070504220829
 
 This is the easy part.  It's late and I can't figure out how to display 
 the resulting URI in Nevow.
] {
hunk ./src/allmydata/webish.py 170
+       privateUpload = annotate.Radio(label="Private?", choices=["Yes"])
+       privatearg = annotate.Argument("privateupload", privateUpload)
+
hunk ./src/allmydata/webish.py 174
- -        meth = annotate.Method(arguments=[contentsarg, ctxarg],
+        meth = annotate.Method(arguments=[contentsarg, privatearg, ctxarg],
hunk ./src/allmydata/webish.py 178
- -    def upload(self, contents, ctx):
+    def upload(self, contents, privateupload, ctx):
hunk ./src/allmydata/webish.py 185
- -        d.addCallback(lambda vid:
- -                      self._dirnode.callRemote("add_file", name, vid))
+       if not privateupload:
+            d.addCallback(lambda vid:
+                          self._dirnode.callRemote("add_file", name, vid))
hunk ./src/allmydata/webish.py 189
- -            log.msg("webish upload complete")
- -            return res
+            log.msg("webish upload complete, uri: %s" % res)
+            #return res
+            if privateupload:
+                return url.here.add("results",
+                                    "upload of '%s' complete!  URI is %s" %
+                                    (contents.filename, res))
}

Context:

[add link to ticket #36 -- FUSE integration
"Zooko O'Whielacronx <zooko@zooko.com>"**20070504170601] 
[test_introducer.py: turn off the defer.setDebugging(True) call that was left over from a troubleshooting session: it slows down the test suite by a factor of 2
warner@lothar.com**20070504074523] 
[add deb-etch target, rearrange make-version a bit, closes #23
warner@lothar.com**20070504070706] 
[add link to ticket #34 -- disk space limits in storage servers
"Zooko O'Whielacronx <zooko@zooko.com>"**20070504055752] 
[makefile: delete .pycs before running tests, since our build process puts the wrong filenames into them
warner@lothar.com**20070504041215] 
[.darcs-boringfile: ignore some build/ directories for foolscap and zfec
warner@lothar.com**20070504033151] 
[version.py: handle both '0.2.0' and '0.2.0-1', remove 'tags' for now
warner@lothar.com**20070504033127] 
[update version-number handling, pull release tags from darcs history
warner@lothar.com**20070504031407] 
[TAG allmydata-tahoe-0.2.0
warner@lothar.com**20070504024220] 
Patch bundle hash:
fd8a427529c09561c038f823ac48ed15b82f3d12
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)

iD8DBQFGO692G5ga/wns7AYRAhnTAJ4tubaWUK/Nrd7wUtWr9B+mf14E/QCgzkC9
Q/BGQ1/vfhQ2O4UxWexdEmM=
=y/Bw
-----END PGP SIGNATURE-----