[project @ zyp-20060511163459-2e238e10d316fe12]

[project @ 29]
Adapted pyanidb to distutils.

9 files changed, 23 insertions, 138 deletions

diff --git a/anidb_add.py b/anidb_add
index b84f162..04dc1df 100644
--- a/anidb_add.py
+++ b/anidb_add
@@ -1,15 +1,26 @@
 #!/usr/bin/env python
 
-import ConfigParser, os, sys, thread, time, getpass, anidb, ed2k
+import pyanidb as anidb
+import ConfigParser, os, sys, thread, time, getpass, multihash
 
 num_threads = 0
 
+def file_hash(name):
+	e = multihash.Ed2k()
+	f = open(name)
+	data = f.read(32768)	
+	while data:
+		e.update(data)
+		data = f.read(32768)
+	f.close()
+	return e.digest()
+
 def hash_file(name):
 	if not os.access(name, os.R_OK):
 		print 'Invalid file: %s' % (name)
 		return
 	size = os.stat(name).st_size
-	hash = ed2k.file_hash(name)
+	hash = file_hash(name)
 	print 'Hashed: ed2k://|file|%s|%d|%s|' % (name, size, hash)
 	return name, size, hash
 
diff --git a/ed2k/Makefile b/ed2k/Makefile
deleted file mode 100644
index 07d23df..0000000
--- a/ed2k/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-CC=gcc
-CFLAGS=
-CPP=g++
-CPPFLAGS=
-LD=gcc
-LDFLAGS=-shared
-
-OBJECTS=ed2k_wrapper.o ed2k.o
-TARGET=_ed2k.so
-INCLUDE=-I /usr/include/python2.4/
-LIB=-l boost_python -l ssl
-
-all: $(TARGET)
-
-clean:
-	-rm $(TARGET) $(OBJECTS)
-
-# M�-regel
-$(TARGET): $(OBJECTS) Makefile
-	$(LD) $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIB)
-
-# Pseudoregler
-%.o: %.c Makefile
-	$(CC) $(CFLAGS) -o $@ -c $< $(INCLUDE)
-
-%.o: %.cpp Makefile
-	$(CPP) $(CPPFLAGS) -o $@ -c $< $(INCLUDE)
\ No newline at end of file
diff --git a/ed2k/__init__.py b/ed2k/__init__.py
deleted file mode 100644
index 754b5c9..0000000
--- a/ed2k/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from _ed2k import *
-
-def file_hash(name):
-	e = Ed2k()
-	f = open(name)
-	data = f.read(32768)	
-	while data:
-		e.update(data)
-		data = f.read(32768)
-	f.close()
-	return e.digest()
diff --git a/ed2k/ed2k.cpp b/ed2k/ed2k.cpp
deleted file mode 100644
index 369f57e..0000000
--- a/ed2k/ed2k.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-#include "ed2k.h"
-
-namespace Hex {
-	static char* digits = "0123456789abcdef";
-	std::string hex(char* bin, int length) {
-		std::string s(length * 2, ' ');
-		for(int i = 0; i < length; i++) {
-			s[i*2] = digits[(bin[i] >> 4) & 0xf];
-			s[i*2+1] = digits[bin[i] & 0xf];
-		}
-		return s;
-	}
-	std::string hex(int bin) {
-		std::string s(sizeof(int) * 2, ' ');
-		for(int i = 0; i < sizeof(int) * 2; i++) {
-			s[sizeof(int) * 2 - 1 - i] = digits[bin & 0xf];
-			bin = bin >> 4;
-		}
-		return s;
-	}
-}
-
-template<class T>
-inline T min(T a, T b) {
-	return (a > b) ? b : a;
-}
-
-Ed2k::Ed2k() {
-	MD4_Init(&md4_partial);
-	MD4_Init(&md4_final);
-	size_total = 0;
-	digest_str = "";
-}
-
-void Ed2k::update(std::string data_str) {
-	unsigned int length = data_str.length();
-	const char* data = data_str.c_str();
-	while(length) {
-		if(!(size_total % (9500 * 1024)) && size_total) {
-			unsigned char digest[16];
-			MD4_Final(digest, &md4_partial);
-			MD4_Update(&md4_final, digest, 16);
-			MD4_Init(&md4_partial);
-		}
-		int size = min<int>(length, (9500 * 1024) - (size_total % (9500 * 1024)));
-		MD4_Update(&md4_partial, data, size);
-		length -= size;
-		data += size;
-		size_total += size;
-	};
-}
-
-std::string Ed2k::digest() {
-	if(!digest_str.length()) {
-		char* digest = new char[16];
-		if(size_total > (9500 * 1024)) {
-			unsigned char digest_partial[16];
-			MD4_Final(digest_partial, &md4_partial);
-			MD4_Update(&md4_final, digest_partial, 16);
-			MD4_Final((unsigned char*)digest, &md4_final);
-		} else {
-			MD4_Final((unsigned char*)digest, &md4_partial);
-		}
-		digest_str = Hex::hex(digest, 16);
-		delete digest;
-	}
-	return digest_str;
-}
diff --git a/ed2k/ed2k.h b/ed2k/ed2k.h
deleted file mode 100644
index 97feb61..0000000
--- a/ed2k/ed2k.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef _ED2K_H_
-#define _ED2K_H_
-
-#include <string>
-#include <openssl/md4.h>
-
-class Ed2k {
-	private:
-		MD4_CTX md4_partial;
-		MD4_CTX md4_final;
-		unsigned int size_total;
-		std::string digest_str;
-	public:
-		Ed2k();
-		void update(std::string data);
-		std::string digest();
-};
-
-#endif // _ED2K_H_
diff --git a/ed2k/ed2k_wrapper.cpp b/ed2k/ed2k_wrapper.cpp
deleted file mode 100644
index 0a9f8c8..0000000
--- a/ed2k/ed2k_wrapper.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "ed2k.h"
-
-#include <boost/python.hpp>
-using namespace boost::python;
-
-BOOST_PYTHON_MODULE(_ed2k) {
-	class_<Ed2k>("Ed2k")
-		.def("update", &Ed2k::update)
-		.def("digest", &Ed2k::digest);
-}
diff --git a/pyanidb.conf b/pyanidb.conf
index 093e7a4..f400006 100644
--- a/pyanidb.conf
+++ b/pyanidb.conf
@@ -2,4 +2,4 @@
 
 [auth]
 username = foo
-password = foossecretpassword
\ No newline at end of file
+password = password
diff --git a/anidb.py b/pyanidb/__init__.py
index 1a36ec3..1a36ec3 100644
--- a/anidb.py
+++ b/pyanidb/__init__.py
diff --git a/setup.py b/setup.py
new file mode 100755
index 0000000..ec7e191
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import os
+from distutils.core import setup, Extension
+
+setup(
+	name='pyanidb',
+	packages = ['pyanidb'],
+	scripts = ['anidb_add'])