X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fupload.py;h=02da698a6998497861887708333cd4cadb794134;hb=584346fc54882d5fa7dde2fd3893e1f77c9e1573;hp=dcd008aae5e28aa1e81aea1240eb823c24ee488d;hpb=c62cd1f27f6c0793461e5721fd61866bdc28ed6e;p=dak.git diff --git a/daklib/upload.py b/daklib/upload.py index dcd008aa..02da698a 100644 --- a/daklib/upload.py +++ b/daklib/upload.py @@ -92,6 +92,33 @@ class HashedFile(object): @type: str of C{None} """ + @classmethod + def from_file(cls, directory, filename, section=None, priority=None): + """create with values for an existing file + + Create a C{HashedFile} object that refers to an already existing file. + + @type directory: str + @param directory: directory the file is located in + + @type filename: str + @param filename: filename + + @type section: str or C{None} + @param section: optional section as given in .changes files + + @type priority: str or C{None} + @param priority: optional priority as given in .changes files + + @rtype: L{HashedFile} + @return: C{HashedFile} object for the given file + """ + path = os.path.join(directory, filename) + size = os.stat(path).st_size + with open(path, 'r') as fh: + hashes = apt_pkg.Hashes(fh) + return cls(filename, size, hashes.md5, hashes.sha1, hashes.sha256, section, priority) + def check(self, directory): """Validate hashes @@ -269,6 +296,13 @@ class Changes(object): self._source = Source(self.directory, source_files, self._keyrings, self._require_signature) return self._source + @property + def sourceful(self): + """C{True} if the upload includes source + @type: bool + """ + return "source" in self.architectures + @property def source_name(self): """source package name @@ -387,6 +421,11 @@ class Binary(object): @type: dict-like """ + @classmethod + def from_file(cls, directory, filename): + hashed_file = HashedFile.from_file(directory, filename) + return cls(directory, hashed_file) + @property def source(self): """get tuple with source package name and version @@ -453,6 +492,11 @@ class Source(object): self._files = None + @classmethod + def from_file(cls, directory, filename, keyrings, require_signature=True): + hashed_file = HashedFile.from_file(directory, filename) + return cls(directory, [hashed_file], keyrings, require_signature) + @property def files(self): """dict mapping filenames to L{HashedFile} objects for additional source files