Ticket #2185: src_preferences_screensaver_ScreenSaverApp.cpp.2.diff

src/preferences/screensaver/ScreenSaverApp.cpp

@@ -10 +10 @@
 
 #include "ScreenSaverWindow.h"
 
+#include <Alert.h>
 #include <Application.h>
 #include <Entry.h>
+#include <File.h>
+#include <FindDirectory.h>
+#include <kernel/fs_attr.h>
+#include <kernel/image.h>
+#include <Node.h>
+#include <NodeMonitor.h>
 #include <Path.h>
+#include <ScreenSaver.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
 
+static status_t
+CopyData(BFile& srcFile, BFile& dstFile)
+{   
+    char buffer[4096];
+
+    while (true) {
+        ssize_t bytesRead = srcFile.Read(buffer, sizeof(buffer));
+        if (bytesRead > 0) {
+            ssize_t bytesWritten = dstFile.Write(buffer, bytesRead);
+            if (bytesWritten < 0)
+                return bytesWritten;
+        } else if (bytesRead < 0)
+            return bytesRead;
+        else
+            break;
+    }
+
+    return B_OK;
+}
+
+
+static status_t
+CopyAttributes(BNode& srcNode, BNode& dstNode)
+{
+    srcNode.RewindAttrs();
+    char name[B_ATTR_NAME_LENGTH];
+    while (srcNode.GetNextAttrName(name) == B_OK) {
+        attr_info info;
+        if (srcNode.GetAttrInfo(name, &info) == B_OK) {
+            char buffer[info.size];
+
+            ssize_t bytesRead = srcNode.ReadAttr(name, info.type, 0, buffer, info.size);
+            if (bytesRead > 0) {
+                ssize_t bytesWritten = dstNode.WriteAttr(name, info.type, 0,
+                    buffer, info.size);
+                if (bytesWritten < 0)
+                    return bytesWritten;
+            } else
+                return bytesRead;
+        }
+    }
+
+    return B_OK;        
+}
+
+
+static status_t
+CopyScreenSaver(BFile& srcFile, BFile& dstFile)
+{
+    status_t status = CopyData(srcFile, dstFile);
+    if (status < B_OK)
+        return status;
+        
+    return CopyAttributes(srcFile, dstFile);
+}
+
+
 class ScreenSaverApp : public BApplication {
     public:
         ScreenSaverApp();
         virtual void RefsReceived(BMessage *message);
+        virtual void MessageReceived(BMessage *message);
 
     private:
         BWindow *fScreenSaverWindow;
@@ -34 +100 @@
 {
     fScreenSaverWindow = new ScreenSaverWindow();
     fScreenSaverWindow->Show();
+    
+    // monitor the user's addons directory
+    BPath userAddonsScrDirPath;
+    status_t status = find_directory(B_USER_ADDONS_DIRECTORY,
+        &userAddonsScrDirPath);
+    if (status == B_OK) 
+        status = userAddonsScrDirPath.Append("Screen Savers");
+
+    if (status < B_OK) {
+        BString errorMessage;
+        errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+        errorMessage << "find_directory() failed. \nReason: ";
+        errorMessage << strerror(status);
+        (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+            B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+        return;
+    }
+
+    BEntry userAddonsScrDirEntry(userAddonsScrDirPath.Path());
+    node_ref nodeRef;
+    userAddonsScrDirEntry.GetNodeRef(&nodeRef);
+    status = watch_node(&nodeRef, B_WATCH_DIRECTORY, this);
+    if (status != B_OK)
+        fprintf(stderr, "Could not start watching: %s\n", strerror(status));
 }
 
 
+void
+ScreenSaverApp::MessageReceived(BMessage* message)
+{
+    switch (message->what) {
+        case B_NODE_MONITOR:
+            fScreenSaverWindow->PostMessage(kMsgUpdateList);
+            break;
+
+        default:
+            BApplication::MessageReceived(message);
+            break;
+    }
+}
+
+
 void 
 ScreenSaverApp::RefsReceived(BMessage *message)
 {
-    entry_ref ref;
-    if (message->FindRef("refs", &ref) != B_OK)
-        return;
 
     // Install the screen saver by copying it to the add-ons directory
     // TODO: the translator have a similar mechanism - this could be cleaned
     //  up and have one nicely working solution
-    // TODO: should test if the dropped ref is really a screen saver!
-    // TODO: you can receive more than one ref at a time...
 
-    BEntry entry;
-    entry.SetTo(&ref, true);
-    if (entry.InitCheck() != B_OK)
-        return;
+    int32 index = 0;
+    entry_ref ref;
 
-    BPath path;
-    entry.GetPath(&path);
+    while (message->FindRef("refs", index++, &ref) == B_OK) {
+        BEntry srcEntry;
+        srcEntry.SetTo(&ref, true);
 
-    // TODO: find_directory() anyone??
-    char temp[2*B_PATH_NAME_LENGTH];
-    sprintf(temp,"cp %s '/boot/home/config/add-ons/Screen Savers/'\n", path.Path());
-    system(temp);
-    fScreenSaverWindow->PostMessage(kMsgUpdateList);
+        if (srcEntry.InitCheck() != B_OK)
+            return;
+
+        BPath srcPath;
+        srcEntry.GetPath(&srcPath);
+
+        if (srcEntry.IsDirectory()) {
+            BString errorMessage;
+            errorMessage << srcPath.Leaf() << " is a directory!\n";
+            errorMessage << "You can not install a directory!";
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
+            return;
+        }
+
+        BFile srcFile(srcPath.Path(), O_RDONLY);
+        if (srcFile.InitCheck() != B_OK)
+            return;
+
+        // Check if the file in question is really a screensaver
+
+        // First check for black-listed files:
+        // binary files that may crash the ScreenSaver pref.
+        // without being really screensavers, and the
+        // user may try to throw in the ScreenSaver pref. window
+
+        BString blackListed1("libroot.so");
+        BString blackListed2("runtime_loader");
+
+        BString candidateScr(srcPath.Leaf());
+
+        if (candidateScr == blackListed1
+            || candidateScr == blackListed2) {
+            BString errorMessage;
+            errorMessage << "File " << srcPath.Leaf() << "\n";
+            errorMessage << "is not a screensaver file!";
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
+            continue;
+        }   
+
+
+        // Check all the other files
+
+        image_id candidateScreenSaverId = load_add_on(srcPath.Path());
+        if (candidateScreenSaverId < B_OK) {
+            BString errorMessage;
+            errorMessage << "File " << srcPath.Leaf() << "\n";
+            errorMessage << "is not a screensaver file!";
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
+
+            unload_add_on(candidateScreenSaverId);
+            continue;
+        }
+
+        BScreenSaver* (*instantiate)(BMessage* msg, image_id image); 
+        status_t getImageSymbolStatus = get_image_symbol(candidateScreenSaverId,
+            "instantiate_screen_saver", B_SYMBOL_TYPE_TEXT, (void**)&instantiate);
+        unload_add_on(candidateScreenSaverId);
+
+        if (getImageSymbolStatus < B_OK) {
+            BString errorMessage;
+            errorMessage << "File " << srcPath.Leaf() << "\n";
+            errorMessage << "is not a screensaver file!";
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_INFO_ALERT))->Go();
+            continue;
+        }
+
+        BPath userNewScreenSaver;
+        status_t status = find_directory(B_USER_ADDONS_DIRECTORY,
+            &userNewScreenSaver);
+        if (status < B_OK) {
+            BString errorMessage;
+            errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+            errorMessage << "find_directory() failed. \nReason: ";
+            errorMessage << strerror(status);
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            return;
+        }
+
+        userNewScreenSaver.Append("Screen Savers");
+        userNewScreenSaver.Append(srcPath.Leaf());
+
+        BFile destFile(userNewScreenSaver.Path(), O_RDWR | O_CREAT);
+        if (destFile.InitCheck() != B_OK)
+            return;
+
+        status = CopyScreenSaver(srcFile, destFile);
+        if (status < B_OK) {
+            BString errorMessage;
+            errorMessage << "At " << __PRETTY_FUNCTION__ << "\n";
+            errorMessage << "Copying the screensaver file failed. \nReason: ";
+            errorMessage << strerror(status);
+            (new BAlert("AlertError", errorMessage.String(), "OK", NULL, NULL,
+                B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go();
+            return;
+        }
+
+        fScreenSaverWindow->PostMessage(kMsgUpdateList);    
+    }
 }
 
 

src/preferences/screensaver/ScreenSaverWindow.cpp

@@ -417 +417 @@
             BPath path = basePath;
             path.Append(name);
 
+            // Before adding the item in the list,
+            // check if the file in question is really a screensaver.
+
+            // First check for black-listed files:
+            // binary files that may crash the ScreenSaver pref.
+            // without being really screensavers, and the
+            // user may try to throw in the ScreenSaver pref. window
+
+            BString blackListed1("libroot.so");
+            BString blackListed2("runtime_loader");
+
+            BString candidateScr(path.Leaf());
+
+            if (candidateScr == blackListed1
+                || candidateScr == blackListed2)
+            continue;
+
+            // Check all the other files
+
+            image_id candidateScreenSaverId = load_add_on(path.Path());
+            if (candidateScreenSaverId < B_OK) {
+                unload_add_on(candidateScreenSaverId);
+                continue;
+            }
+
+            BScreenSaver* (*instantiate)(BMessage* msg, image_id image); 
+            status_t getImageSymbolStatus = get_image_symbol(candidateScreenSaverId,
+                "instantiate_screen_saver", B_SYMBOL_TYPE_TEXT, (void**)&instantiate);
+            unload_add_on(candidateScreenSaverId);
+
+            if (getImageSymbolStatus < B_OK)
+                continue;
+
             ScreenSaverItem* item = new ScreenSaverItem(name, path.Path());
             fListView->AddItem(item); 
             
@@ -834 +867 @@
 void
 ScreenSaverWindow::MessageReceived(BMessage *msg)
 {
+    uint32 type; 
+    int32 count;
+
+    // one or more screensavers have been dropped
+    // into the window; inform the application
+    // in order to take care the installation
+    switch (msg->what) {
+        case B_SIMPLE_DATA:
+            msg->GetInfo("refs", &type, &count); 
+            if (count > 0 && type == B_REF_TYPE) { 
+                msg->what = B_REFS_RECEIVED;
+                be_app->PostMessage(msg);
+            }
+            break;
+    }
+
+
     // "Fade" tab, slider updates
 
     switch (msg->what) {