GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix media zipping and addFiles call

Browse source
This commit is contained in:
Damien Elmes 2011-10-03 12:59:35 +09:00
parent 5da3bba1df
commit 49181ee738
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
anki/media.py
View file

@ -348,8 +348,9 @@ create table log (fname text primary key, type int);
if not fname: if not fname:
z.writestr("_finished", "") z.writestr("_finished", "")
break break
fname = fname[0]
z.write(fname, str(cnt)) z.write(fname, str(cnt))
files[str(c)] = dict( files[str(cnt)] = dict(
name=fname, mod=self._mtime(fname)) name=fname, mod=self._mtime(fname))
sz += os.path.getsize(fname) sz += os.path.getsize(fname)
if sz > SYNC_ZIP_SIZE: if sz > SYNC_ZIP_SIZE:

5
anki/sync.py
View file

@ -601,5 +601,6 @@ class RemoteMediaServer(MediaSyncer, HttpSyncer):
return self.postData(self.con, "files", None, self._vars()) return self.postData(self.con, "files", None, self._vars())
def addFiles(self, zip): def addFiles(self, zip):
return self.postData(self.con, "files", StringIO(zip), return simplejson.loads(
self._vars(), comp=0) self.postData(self.con, "addFiles", StringIO(zip),
self._vars(), comp=0))

17
tests/test_sync.py
View file

@ -352,12 +352,13 @@ def setup_remoteMedia():
def test_remoteMediaNothing(): def test_remoteMediaNothing():
client.sync() client.sync()
# @nose.with_setup(setup_media) @nose.with_setup(setup_remoteMedia)
# def test_mediaAdd(): def test_mediaAdd():
# open(os.path.join(deck1.media.dir(), "foo.jpg"), "wb").write("foo") os.chdir(deck1.media.dir())
# assert len(os.listdir(deck1.media.dir())) == 1 open(os.path.join(deck1.media.dir(), "foo.jpg"), "wb").write("foo")
# assert len(os.listdir(deck2.media.dir())) == 0 assert len(os.listdir(deck1.media.dir())) == 1
# client.sync() #assert len(os.listdir(deck2.media.dir())) == 0
# assert len(os.listdir(deck1.media.dir())) == 1 client.sync()
# assert len(os.listdir(deck2.media.dir())) == 1 assert len(os.listdir(deck1.media.dir())) == 1
#assert len(os.listdir(deck2.media.dir())) == 1