kpm: download packages

git-svn-id: svn://kolibrios.org@5726 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge) 2015-08-16 08:48:26 +00:00
parent 11387d6d18
commit f73d56b77c
2 changed files with 23 additions and 79 deletions

View File

@ -29,10 +29,11 @@ void parse_group(pkg_group_t* gr, TiXmlElement *xmlgroup)
xmle = xmlpkg->FirstChildElement(key_description); xmle = xmlpkg->FirstChildElement(key_description);
pkg->description = strdup(xmle->Attribute(key_title)); pkg->description = strdup(xmle->Attribute(key_title));
xmle = xmlpkg->FirstChildElement(key_release);
xmle = xmlpkg->FirstChildElement(key_release);
pkg->filename = strdup(xmle->Attribute(key_file)); pkg->filename = strdup(xmle->Attribute(key_file));
list_add_tail(&pkg->list, &gr->packages);
list_add_tail(&pkg->list, &gr->packages);
xmlpkg = xmlpkg->NextSiblingElement(); xmlpkg = xmlpkg->NextSiblingElement();
}; };
}; };
@ -69,33 +70,4 @@ collection_t* load_collection_file(const char *name)
return collection; return collection;
} }
collection_t* load_collection_buffer(const char *buffer)
{
TiXmlDocument doc;
TiXmlElement *col;
collection_t *collection = NULL;
doc.Parse(buffer);
col = doc.FirstChildElement(key_collection);
if (col)
{
collection = (collection_t*)malloc(sizeof(collection_t));
INIT_LIST_HEAD(&collection->groups);
TiXmlElement* xmlgroup = col->FirstChildElement();
if (xmlgroup)
{
pkg_group_t *gr;
gr = (pkg_group_t*)malloc(sizeof(pkg_group_t));
INIT_LIST_HEAD(&gr->list);
INIT_LIST_HEAD(&gr->packages);
gr->name = strdup(xmlgroup->Value());
list_add_tail(&gr->list, &collection->groups);
parse_group(gr, xmlgroup);
};
};
return collection;
}

View File

@ -9,54 +9,20 @@
#define BUFFSIZE (64*1024) #define BUFFSIZE (64*1024)
int http_load_mem(char *buf, const char *url)
char *make_url(const char *name)
{ {
http_t *http; static char url_buf[128] = "http://ftp.kolibrios.org/users/Serge/new/OS/";
int offset = 0; strcpy(&url_buf[44], name);
int count; return url_buf;
};
// asm volatile("int3"); char *make_cache_path(const char *path)
http = http_get(url, NULL,FLAG_STREAM|FLAG_REUSE_BUFFER, NULL); {
if(http == NULL) static char path_buf[64] = "/tmp0/1/";
goto err_get; strcpy(&path_buf[8], path);
return path_buf;
do };
{
// delay(100);
if(http_receive_with_retry(http, 500)==0)
{
if(http->flags & 0xffff0000)
goto err_http;
count = http->content_received - offset;
if(count == 0)
continue;
memcpy(buf+offset, http->content_ptr, count);
offset = http->content_received;
}
else goto err_http;
}while( (http->flags & FLAG_GOT_ALL_DATA) == 0);
if(http->content_ptr)
user_free(http->content_ptr);
http_free(http);
return offset;
err_http:
if(http->content_ptr)
user_free(http->content_ptr);
http_free(http);
printf("HTTP receive failed\n");
return offset;
err_get:
printf("HTTP GET failed\n");
return offset;
}
int http_load_file(const char *path, const char *url) int http_load_file(const char *path, const char *url)
{ {
@ -147,18 +113,21 @@ err_get:
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int count; int count;
char *cache_path;
if(http_init()) if(http_init())
goto err_init; goto err_init;
count = http_load_file("/tmp0/1/packages.xml", "http://ftp.kolibrios.org/users/Serge/new/OS/packages.xml"); cache_path = make_cache_path("packages.xml");
count = http_load_file(cache_path, make_url("packages.xml"));
if(count) if(count)
{ {
collection_t *collection; collection_t *collection;
pkg_group_t *gr; pkg_group_t *gr;
collection = load_collection_file("/tmp0/1/packages.xml"); collection = load_collection_file(cache_path);
list_for_each_entry(gr, &collection->groups, list) list_for_each_entry(gr, &collection->groups, list)
{ {
@ -167,6 +136,9 @@ int main(int argc, char *argv[])
list_for_each_entry(pkg, &gr->packages, list) list_for_each_entry(pkg, &gr->packages, list)
{ {
printf("package %s-%s\n", pkg->name, pkg->version); printf("package %s-%s\n", pkg->name, pkg->version);
cache_path = make_cache_path(pkg->filename);
count = http_load_file(cache_path, make_url(pkg->filename));
printf("%s loaded %d\n",cache_path, count);
} }
}; };
} }