Changeset 198

Timestamp:

07/03/08 10:13:31 (3 months ago)

Author:

dino

Message:

• some docscrings
  
• refactoring
  
• avahi_name not configable
  

Location:

projects/apt-zeroconf/trunk

Files:

• apt-zeroconf (modified) (1 diff)
• aptzeroconf/__init__.py (modified) (2 diffs)
• aptzeroconf/avaphi.py (modified) (4 diffs)
• aptzeroconf/util.py (modified) (3 diffs)
• support/apt-zeroconf.conf (modified) (1 diff)

projects/apt-zeroconf/trunk/apt-zeroconf

@@ -30 +30 @@
 pidfile = '/var/run/apt-zeroconf.pid'
 logfile = '/var/log/apt-zeroconf'
+
 
 if options.background:

projects/apt-zeroconf/trunk/aptzeroconf/__init__.py

@@ -35 +35 @@
 logging.basicConfig(level=logging.DEBUG,
         format='%(asctime)s [%(threadName)s] [%(levelname)-7s] %(message)s',
-        datefmt='%Y-%m-%d %H:%M:%S'
-)
+        datefmt='%Y-%m-%d %H:%M:%S')
 
 import signal
@@ -47 +46 @@
 
 def main():
+    logging.debug('apt-zeroconf %s' % __version__)
+
     # Kick off the httpd
-    logging.debug('apt-zeroconf %s' % __version__)
     logging.debug('Starting httpd on port %i.' % config['http_port'])
     httpd = HttpServer()

projects/apt-zeroconf/trunk/aptzeroconf/avaphi.py

@@ -36 +36 @@
 from aptzeroconf.config import config
 
-stype = '_apt._tcp'
-domain = ''
-host = ''
-txt = []
-
 
 class AZCAvahiService(threading.Thread):
@@ -50 +45 @@
         self.n_rename = 0
 
-        self.name = config['avahi_name'] % config['hostname']
-        self.stype = stype
-        self.domain = domain
-        self.host = host
+        self.name = 'apt-zeroconf repository on %s' % config['hostname']
+        self.stype = '_apt._tcp'
+        self.domain = ''
+        self.host = ''
         self.port = config['http_port']
-        self.txt = txt
+        self.data = ['downloading=False'] # TODO use me!
 
         hosts.set_service(self)
@@ -81 +76 @@
                 self.name, self.stype, self.domain, self.host,
                 dbus.UInt16(self.port),
-                avahi.string_array_to_txt_array(self.txt))
+                avahi.string_array_to_txt_array(self.data))
         self.group.Commit()
 
@@ -187 +182 @@
             return
 
+        data = {}
+        for i in avahi.txt_array_to_string_array(txt):
+            i = i.split('=')
+            data[i[0]] = [1]
+
         url = make_url(address, port, protocol)
         self['%s:%s:%s' % (name, interface, domain)] = {
-                'host': host, 'address': address, 'port': port, 'txt': txt,
+                'host': host, 'address': address, 'port': port, 'data': data,
                 'proto': protocol, 'url': url,
                 'pkglist': self._fetch_list(url)}

projects/apt-zeroconf/trunk/aptzeroconf/util.py

@@ -25 +25 @@
 # synchronized decorator
 def synchronized(lock):
+    """Wrapper function to make threadsave code easy. To be used as 
+       decorater."""
     def wrap(f):
         def func(*args, **kw):
@@ -38 +40 @@
 EPOCH_PATTERN = re.compile(r'\_\d+\%3a')
 
-def prune_epoch(f):
-    return EPOCH_PATTERN.sub('_', f)
+def prune_epoch(fname):
+    """Prune epoch from package name as apt does. """
+    return EPOCH_PATTERN.sub('_', fname)
 
 def make_url(address, port, proto):
@@ -45 +48 @@
     return '%s:%i' % \
         ((proto == avahi.PROTO_INET6 and '[%s]' or '%s') % address, port)
-

projects/apt-zeroconf/trunk/support/apt-zeroconf.conf

@@ -5 +5 @@
 apt_cache_path = /var/cache/apt/archives
 
-# name of the avahi-service, %s will be replaced with the hostname
-avahi_name = apt-zeroconf repository on %s
 # override hostname if needed
 ;hostname = machine