mirror of
https://github.com/ankitects/anki.git
synced 2025-09-24 16:56:36 -04:00
fix media zipping and addFiles call
This commit is contained in:
parent
5da3bba1df
commit
49181ee738
3 changed files with 14 additions and 11 deletions
|
@ -348,8 +348,9 @@ create table log (fname text primary key, type int);
|
|||
if not fname:
|
||||
z.writestr("_finished", "")
|
||||
break
|
||||
fname = fname[0]
|
||||
z.write(fname, str(cnt))
|
||||
files[str(c)] = dict(
|
||||
files[str(cnt)] = dict(
|
||||
name=fname, mod=self._mtime(fname))
|
||||
sz += os.path.getsize(fname)
|
||||
if sz > SYNC_ZIP_SIZE:
|
||||
|
|
|
@ -601,5 +601,6 @@ class RemoteMediaServer(MediaSyncer, HttpSyncer):
|
|||
return self.postData(self.con, "files", None, self._vars())
|
||||
|
||||
def addFiles(self, zip):
|
||||
return self.postData(self.con, "files", StringIO(zip),
|
||||
self._vars(), comp=0)
|
||||
return simplejson.loads(
|
||||
self.postData(self.con, "addFiles", StringIO(zip),
|
||||
self._vars(), comp=0))
|
||||
|
|
|
@ -352,12 +352,13 @@ def setup_remoteMedia():
|
|||
def test_remoteMediaNothing():
|
||||
client.sync()
|
||||
|
||||
# @nose.with_setup(setup_media)
|
||||
# def test_mediaAdd():
|
||||
# open(os.path.join(deck1.media.dir(), "foo.jpg"), "wb").write("foo")
|
||||
# assert len(os.listdir(deck1.media.dir())) == 1
|
||||
# assert len(os.listdir(deck2.media.dir())) == 0
|
||||
# client.sync()
|
||||
# assert len(os.listdir(deck1.media.dir())) == 1
|
||||
# assert len(os.listdir(deck2.media.dir())) == 1
|
||||
@nose.with_setup(setup_remoteMedia)
|
||||
def test_mediaAdd():
|
||||
os.chdir(deck1.media.dir())
|
||||
open(os.path.join(deck1.media.dir(), "foo.jpg"), "wb").write("foo")
|
||||
assert len(os.listdir(deck1.media.dir())) == 1
|
||||
#assert len(os.listdir(deck2.media.dir())) == 0
|
||||
client.sync()
|
||||
assert len(os.listdir(deck1.media.dir())) == 1
|
||||
#assert len(os.listdir(deck2.media.dir())) == 1
|
||||
|
||||
|
|
Loading…
Reference in a new issue