Others ktm fixes

diff --git a/ktm/src/ktm_classes_config.kvs b/ktm/src/ktm_classes_config.kvs
index dea24bf5e66c9b726cd0c56d3e74bed774aeec63..d95ca14f0faffbc2c1ef3645f07f5bc43e4984c1 100644 (file)
--- a/ktm/src/ktm_classes_config.kvs
+++ b/ktm/src/ktm_classes_config.kvs
@@ -14,6 +14,7 @@ alias(ktm::classes::config)
                {
                        return $file.read(%c,"firstTime",$false)
                }
+               
        }
 }
 

diff --git a/ktm/src/ktm_classes_ftp.kvs b/ktm/src/ktm_classes_ftp.kvs
new file mode 100644 (file)
index 0000000..2f96743
--- /dev/null
+++ b/ktm/src/ktm_classes_ftp.kvs
@@ -0,0 +1,16 @@
+alias(ktm::classes::ftp)
+{
+       class(ktm::ftp,ftp)
+       {
+               commandFinishedEvent()
+               {
+                       //echo $0 $1 $2
+                       if ($1=="Downloaded") @$emit("downloaded")
+               }
+               dataTransferProgressEvent()
+               {
+               //      echo downloaded $0/$1
+               }
+       }
+}
+

diff --git a/ktm/src/ktm_classes_http.kvs b/ktm/src/ktm_classes_http.kvs
index fae2336eb46b00da3eaec388082137829df0664b..06cae2ceb303bfe139e00604991bc27b7bc51079 100644 (file)
--- a/ktm/src/ktm_classes_http.kvs
+++ b/ktm/src/ktm_classes_http.kvs
@@ -4,6 +4,7 @@ alias(ktm::classes::http)
        {
                get()
                {
+                       //echo geto
                        return $$->$http::get($0,$1)
                }
                page()
@@ -12,25 +13,19 @@ alias(ktm::classes::http)
                }
                readyReadEvent()
                {
+                       //echo ready read $0 and 
                        @%page .=@$readAll()
                }
                dataReadProgressEvent()
                {
+                       //echo data progress $0 $1 
                        @$emit(dataReadProgress,$0,$1,@$currentId())
                }
-               stateChangedEvent()
-               {
-                       @$emit(stateChanged,$0)
-               }
                requestFinishedEvent()
                {
+                       //echo finished $0
                         @$emit(finished,$0)
                }
-               responseHeaderReceivedEvent()
-               {
-               }
-       
        }
 }
 
-

diff --git a/ktm/src/ktm_classes_main.kvs b/ktm/src/ktm_classes_main.kvs
index 0a05775979658dd2f3b409ebcf27170ff43afe88..74ec419a14b5b716e9cfa6e26a6e36b654ec5a9d 100644 (file)
--- a/ktm/src/ktm_classes_main.kvs
+++ b/ktm/src/ktm_classes_main.kvs
@@ -12,6 +12,7 @@ alias(ktm::classes::main)
                }
                destructor()
                {
+                       if ($objects.exists(@%ftp)) delete @%ftp
                        if ($objects.exists(@%kvinet_http)) delete @%kvinet_http
                        delete @%themesList
                        if ($objects.exists(@%mainDialog)) delete @%mainDialog
@@ -41,12 +42,12 @@ alias(ktm::classes::main)
                        delete @%kvinet_http
                        @%kvinet_http=$new(ktm::http,$$)
                        @%kvinet_http->$setHost("www.kvirc.net")
-                       echo new http
                        $ktm::functions::createInfoThemesList(@%page,@%themesList)
                        @$getRemotePreviews
                        objects.connect @%kvinet_http dataReadProgress @%mainDialog SETpb
                        objects.connect $$ done @%mainDialog done
                        objects.connect @%mainDialog closing $$ closeScript
+                       objects.connect @%mainDialog install $$ loadTheme
                        @%mainDialog->$init(@%themesList)
                        @%mainDialog->$show()
                }
@@ -61,7 +62,27 @@ alias(ktm::classes::main)
                        %pixmap->$scale(@%thumb_width,@%thumb_height,"KeepAspectRatio","Smooth")
                        return %pixmap
                }
-       
+               loadTheme()
+               {
+                       %theme=@%themesList->$current()
+                       if (!@%ftp)
+                       {
+                               @%ftp=$new(ktm::ftp)
+                               objects.connect @%ftp downloaded $$ installTheme
+                       }
+                       @%Ftp->$connect(ftp.kvirc.de)
+                       @%Ftp->$login("","")
+                       @%Ftp->$cd(pub/kvirc/themes/)
+                       @%Ftp->$get(%theme->%remotefile,$file.localdir(tmp/themetemp.kvt))
+               }
+               installTheme()
+               {
+                       
+               //      echo install theme
+                       @%Ftp->$close()
+                       theme.install $file.localdir(tmp/themetemp.kvt)
+               //      echo installed
+               }
                firstTimeRun()
                {
                        if (!$file.exists($file.localdir("pics/ktm/previews")))
@@ -121,4 +142,3 @@ alias(ktm::classes::main)
        }
 }
 
-

diff --git a/ktm/src/ktm_classes_register.kvs b/ktm/src/ktm_classes_register.kvs
index b300fdf9210de8fb22586e0b7f728835ece0f257..8d9fbd7c6152cc3d8ce93d40f8f26c7a8512a117 100644 (file)
--- a/ktm/src/ktm_classes_register.kvs
+++ b/ktm/src/ktm_classes_register.kvs
@@ -2,6 +2,7 @@ alias(ktm::classes::register)
 {
        %classesaliases[]=$array(ktm::classes::config,\
        ktm::classes::http,\
+       ktm::classes::ftp,\
        ktm::classes::config,\
        ktm::classes::themeslist,\
        ktm::classes::main,\
@@ -19,4 +20,3 @@ alias(ktm::classes::register)
        }
 }
 
-

diff --git a/ktm/src/ktm_classes_themeslist.kvs b/ktm/src/ktm_classes_themeslist.kvs
index 2a06fc97b36cc407d3a76ebf9262ecb461d9325c..a148766b453ec41221347bb8e5cbc9767808e8b7 100644 (file)
--- a/ktm/src/ktm_classes_themeslist.kvs
+++ b/ktm/src/ktm_classes_themeslist.kvs
@@ -1,6 +1,5 @@
 alias(ktm::classes::themeslist)
 {
-       objects.killClass -q  ktn::themesList
        class(ktm::themesList,list)
        {
                constructor()

diff --git a/ktm/src/ktm_functions_createInfoThemesList.kvs b/ktm/src/ktm_functions_createInfoThemesList.kvs
index 256e5e36aca50c2843a216e24491abb965118449..975635fbd0eee64b7852ce1db0a2c02098f2a99f 100644 (file)
--- a/ktm/src/ktm_functions_createInfoThemesList.kvs
+++ b/ktm/src/ktm_functions_createInfoThemesList.kvs
@@ -37,7 +37,9 @@ alias(ktm::functions::createInfoThemesList)
                %themeright_index=$str.find(%page_filtered,"\<div class\=\"left\"\>",$(%count+1))
                if (%themeright_index==-1) break
                %theme=$str.mid(%page_filtered,%to,$(%themeright_index-%to))
-               %themes->$append($ktm::functions::createThemeInfo(%theme))
+               %theme_obj=$ktm::functions::createThemeInfo(%theme)
+               %themes->$append(%theme_obj)
+               
                %count++
                %anticrash++
                if (%anticrash>100) break

diff --git a/ktm/src/ktm_functions_createThemeInfo.kvs b/ktm/src/ktm_functions_createThemeInfo.kvs
index 7c13dc3b864ce9083a9acec58f237827ed1c66dc..daaa4d14740269e20405272dafe7fc6503bd17df 100644 (file)
--- a/ktm/src/ktm_functions_createThemeInfo.kvs
+++ b/ktm/src/ktm_functions_createThemeInfo.kvs
@@ -11,10 +11,11 @@ alias(ktm::functions::createThemeInfo)
        %filename=$str.grep("<a href=\"img/themes/(theme_[az-AZ\-]*.(png|jpg))",%str,rp)[1]
        %theme->%preview_filename=%filename
        %theme->%shot=$file.localdir("pics/ktm/previews/%filename")
-       %theme->%downloadlink=$str.grep("ftp:\/\/([^\"]+)",%str,rp)[1]
+       %theme->%remotefile=$str.token(4,"/",$str.grep("ftp:\/\/([^\"]+)",%str,rp)[1])
        if ($str.findfirst(%str,"mailto:")!=-1) %desc[]=$str.grep("\"desc\"><p><b>[^<]+</b><a [^>]+>([^<]+)</a><br /><b>[^<]+</b>([^<]+)",%str,rp)
        else %desc[]=$str.grep("\"desc\"><p><b>[^<]+</b>([^<]+)<br /><b>[^<]+</b>([^<]+)",%str,rp)
        %theme->%author= %desc[1]
+       if ($str.right(%desc[2],1)!=".") %desc[2].="."
        %theme->%description= %desc[2]
        return %theme
        
@@ -25,4 +26,3 @@ alias(ktm::functions::createThemeInfo)
        //%theme->%description=$str.grep("<b>Description: </b>([az-AZ \-:\)_0123456789]+)<br />",%str,rp)[1]
 }
 
-