Merge lp:~akshatj/dmedia/quick-id into lp:~jderose/dmedia/trunk

[Akshat Jain]

=== modified file 'dmedialib/filestore.py'
--- dmedialib/filestore.py	2010-10-21 04:42:28 +0000
+++ dmedialib/filestore.py	2010-11-14 03:56:13 +0000
@@ -1,5 +1,6 @@
 # Authors:
 #   Jason Gerard DeRose <[e-mail]>
+#   Akshat Jain <[e-mail])
 #
 # dmedia: distributed media library
 # Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
@@ -36,8 +37,16 @@
 
 
 CHUNK = 2 ** 20  # Read in chunks of 1 MiB
+QUICK_ID_CHUNK = 2 ** 20
 DOTDIR = '.dmedia'
 
+def quick_id(filename):
+ 
+   hash_ = sha1()
+   hash_.update(str(path.getsize(filename)))
+   hash_.update(open(filename, 'rb').read(QUICK_ID_CHUNK))
+   return b32encode(hash_.digest())
+ 
 
 def normalize_ext(name):
     """

=== modified file 'dmedialib/tests/test_filestore.py'
--- dmedialib/tests/test_filestore.py	2010-11-08 00:37:51 +0000
+++ dmedialib/tests/test_filestore.py	2010-11-14 03:56:13 +0000
@@ -1,5 +1,6 @@
 # Authors:
 #   Jason Gerard DeRose <[e-mail]>
+#   Akshat Jain <[e-mail]>
 #
 # dmedia: distributed media library
 # Copyright (C) 2010 Jason Gerard DeRose <[e-mail]>
@@ -28,7 +29,7 @@
 from os import path
 import hashlib
 from unittest import TestCase
-from .helpers import TempDir, TempHome, raises
+from .helpers import TempDir, TempHome, raises, sample_mov
 from dmedialib import filestore
 
 
@@ -45,7 +46,10 @@
 
 
 class test_functions(TestCase):
-
+    def test_quick_id(self):
+        f = filestore.quick_id
+        self.assertEqual(f(sample_mov), 'GJ4AQP3BK3DMTXYOLKDK6CW4QIJJGVMN')
+        
     def test_scanfiles(self):
         f = filestore.scanfiles
         tmp = TempDir()