Ticket #5091: 5091.patch

docs/filezilla.man

@@ -4 +4 @@
 .SH SYNOPSIS
 .B filezilla
 .br
-.B filezilla [\-l <logontype>] <FTP URL>
+.B filezilla [-s] [\-l <logontype>] [<FTP URL>]... [fzsite://<SITE>]...
 .br
 .B filezilla \-h|\-s|\-v
-.br
-.B filezilla \-c <site>
 .SH DESCRIPTION
 FileZilla is a powerful client for plain FTP, FTP over SSL/TLS (FTPS) and the SSH File Transfer Protocol (SFTP).
 .SH OPTIONS
 
 .TP
-.B \-c <site>, \-\-site <site>
-Connect to the given site from the Site Manager.
+.B <FTP URL>...
+Connect to the given FTP URL(s).
+
+.TP
+.B fzsite://<SITE>
+Connect to the given site(s) from the Site Manager.
 Site has to be given as complete path, with a slash as separation character. Any slash or backslash that is part of a segment has to be escaped with a backslash. Path has to be prefixed with 0 for user defined entries or 1 for default entries. Site path may not contain double quotation marks.
 .IP
-Example: filezilla \-c 0/foo/bar/sl\\/ash connects to the user site sl/ash in the site directory foo/bar
-.IP
-May not be used together with
-.B \-s
-nor with URL parameter.
+Example: filezilla fzsite://0/foo/bar/sl\\/ash connects to the user site sl/ash in the site directory foo/bar
 
 .TP
 .B \-h, \-\-help
@@ -30 +28 @@
 
 .TP
 .B \-l <logontype>, \-\-logontype <logontype>
-Set a special logontype, can only be used in combination with a FTP URL as argument.
+Set a special logontype, will only be used in combination with FTP URL(s).
 
 Logontype has to be either
 .B ask

src/interface/cmdline.cpp

@@ -5 +5 @@
 {
     m_parser.AddSwitch(_T("h"), _T("help"), _("Shows this help dialog"), wxCMD_LINE_OPTION_HELP);
     m_parser.AddSwitch(_T("s"), _T("site-manager"), _("Start with opened Site Manager"));
-    m_parser.AddOption(_T("c"), _T("site"), _("Connect to specified Site Manager site"));
 
-    wxString desc = wxString::Format(_("Logontype, can only be used together with FTP URL. Argument has to be either '%s' or '%s'"), _T("ask"), _T("interactive"));
+    wxString desc = wxString::Format(_("Logontype, will only be used together with FTP URL(s). Argument has to be either '%s' or '%s'"), _T("ask"), _T("interactive"));
     m_parser.AddOption(_T("l"), _T("logontype"), desc);
 
 #ifdef __WXMSW__
@@ -15 +14 @@
 #endif
     m_parser.AddSwitch(_T(""), _T("verbose"), _("Verbose log messages from wxWidgets"));
     m_parser.AddSwitch(_T("v"), _T("version"), _("Print version information to stdout and exit"));
-    wxString str = _T("<");
-    str += _("FTP URL");
-    str += _T(">");
-    m_parser.AddParam(str, wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL);
+    m_parser.AddParam(_("FTP URL"), wxCMD_LINE_VAL_STRING, (wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE));
 
+    wxString str = _T("fzsite://");
+    str += _("SITE");
+    m_parser.AddParam(str, wxCMD_LINE_VAL_STRING, (wxCMD_LINE_PARAM_OPTIONAL|wxCMD_LINE_PARAM_MULTIPLE));
+
     m_parser.SetCmdLine(argc, argv);
 
     m_parser.SetSwitchChars(_T("-"));
@@ -63 +63 @@
     if (res != 0)
         return false;
 
-    if (HasSwitch(sitemanager) && GetOption(site) != _T(""))
-    {
-        wxMessageBox(_("-s and -c cannot be present at the same time."), _("Syntax error in command line"));
-        return false;
-    }
-
-    if (HasSwitch(sitemanager) && m_parser.GetParamCount())
-    {
-        wxMessageBox(_("-s cannot be used together with an FTP URL."), _("Syntax error in command line"));
-        return false;
-    }
-
-    if (GetOption(site) != _T("") && m_parser.GetParamCount())
-    {
-        wxMessageBox(_("-c cannot be used together with an FTP URL."), _("Syntax error in command line"));
-        return false;
-    }
-
     wxString type = GetOption(logontype);
     if (type != _T(""))
     {
@@ -108 +90 @@
     m_parser.Usage();
 }
 
-wxString CCommandLine::GetParameter() const
+void CCommandLine::GetParameters(std::vector<wxString> &params) const
 {
-    if (!m_parser.GetParamCount())
-        return _T("");
+    size_t paramCount = m_parser.GetParamCount();
+    params.clear();
+    params.reserve(paramCount);
 
-    return m_parser.GetParam();
+    for(size_t i = 0; i < paramCount; i++)
+    {
+        params.push_back(m_parser.GetParam(i));
+    }
 }

src/interface/cmdline.h

@@ -25 +25 @@
 
     bool HasSwitch(enum t_switches s) const;
     wxString GetOption(enum t_option option) const;
-    wxString GetParameter() const;
+    // Fetch all parameters 
+    void GetParameters(std::vector<wxString> &params) const;
 
 protected:
     wxCmdLineParser m_parser;

src/interface/Mainfrm.cpp

@@ -1963 +1963 @@
     ShowDropdownMenu(pMenu, m_pToolBar, event);
 }
 
-bool CMainFrame::ConnectToSite(CSiteManagerItemData_Site* const pData)
+bool CMainFrame::ConnectToSite(CSiteManagerItemData_Site* const pData, bool newtab /*=false*/)
 {
     wxASSERT(pData);
 
@@ -1974 +1974 @@
             return false;
     }
 
-    if (!ConnectToServer(pData->m_server, pData->m_remoteDir))
+    if (!ConnectToServer(pData->m_server, pData->m_remoteDir, newtab))
         return false;
 
     if (pData->m_localDir != _T(""))
@@ -2425 +2425 @@
     if (!pCommandLine)
         return;
 
-    wxString site;
-    if (pCommandLine->HasSwitch(CCommandLine::sitemanager))
+    std::vector<wxString> params;
+    pCommandLine->GetParameters(params);
+    if (!params.empty())
     {
-        Show();
-        OpenSiteManager();
-    }
-    else if ((site = pCommandLine->GetOption(CCommandLine::site)) != _T(""))
-    {
-        CSiteManagerItemData_Site* pData = CSiteManager::GetSiteByPath(site);
-
-        if (pData)
-        {
-            if (ConnectToSite(pData))
-            {
-                SetBookmarksFromPath(site);
-                if (m_pMenuBar)
-                    m_pMenuBar->UpdateBookmarkMenu();
-            }
-            delete pData;
-        }
-    }
-
-    wxString param = pCommandLine->GetParameter();
-    if (param != _T(""))
-    {
         wxString error;
-
         CServer server;
 
         wxString logontype = pCommandLine->GetOption(CCommandLine::logontype);
@@ -2460 +2438 @@
         else if (logontype == _T("interactive"))
             server.SetLogonType(INTERACTIVE);
 
-        CServerPath path;
-        if (!server.ParseUrl(param, 0, _T(""), _T(""), error, path))
+        // Iterate over available parameters
+        for(std::vector<wxString>::iterator iter = params.begin(); iter != params.end(); ++iter)
         {
-            wxString str = _("Parameter not a valid URL");
-            str += _T("\n") + error;
-            wxMessageBox(error, _("Syntax error in command line"));
-        }
+            wxString site;
 
-        if (server.GetLogonType() == ASK ||
-            (server.GetLogonType() == INTERACTIVE && server.GetUser() == _T("")))
-        {
-            if (!CLoginManager::Get().GetPassword(server, false))
+            // Check if parameter is a site
+            if (iter->StartsWith(_T("fzsite://"), &site))
+            {
+                CSiteManagerItemData_Site* pData = CSiteManager::GetSiteByPath(site);
+
+                if (pData)
+                {
+                    if (ConnectToSite(pData, true))
+                    {
+                        SetBookmarksFromPath(site);
+                        if (m_pMenuBar)
+                            m_pMenuBar->UpdateBookmarkMenu();
+                    }
+                    delete pData;
+                }
+                continue;
+            }
+
+            // Not a site, try parsing as URL
+            CServerPath path;
+            if (!server.ParseUrl(*iter, 0, _T(""), _T(""), error, path))
+            {
+                wxString str = _("Parameter not a valid URL");
+                str += _T("\n") + error;
+                wxMessageBox(error, _("Syntax error in command line"));
+                continue;
+            }
+
+            if (server.GetLogonType() == ASK ||
+                (server.GetLogonType() == INTERACTIVE && server.GetUser() == _T("")))
+            {
+                if (!CLoginManager::Get().GetPassword(server, false))
+                    continue;
+            }
+
+            CState* pState = CContextManager::Get()->GetCurrentContext();
+            if (!pState)
                 return;
+
+            ConnectToServer(server, path, true);
         }
-
-        CState* pState = CContextManager::Get()->GetCurrentContext();
-        if (!pState)
-            return;
-
-        ConnectToServer(server, path);
     }
+    
+    if (pCommandLine->HasSwitch(CCommandLine::sitemanager))
+    {
+        Show();
+        OpenSiteManager();
+    }
 }
 
 void CMainFrame::OnFilterRightclicked(wxCommandEvent& event)
@@ -2695 +2705 @@
     }
 }
 
-bool CMainFrame::ConnectToServer(const CServer &server, const CServerPath &path /*=CServerPath()*/)
+bool CMainFrame::ConnectToServer(const CServer &server, const CServerPath &path /*=CServerPath()*/, bool newtab /*=false*/)
 {
     CState* pState = CContextManager::Get()->GetCurrentContext();
     if (!pState)
@@ -2703 +2713 @@
 
     if (pState->IsRemoteConnected() || !pState->IsRemoteIdle())
     {
-        wxDialogEx dlg;
-        if (dlg.Load(this, _T("ID_ALREADYCONNECTED")))
+        if (newtab)
         {
-            if (COptions::Get()->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE) != 0)
-                XRCCTRL(dlg, "ID_OLDTAB", wxRadioButton)->SetValue(true);
-            else
-                XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->SetValue(true);
+            m_pContextControl->CreateTab();
+            pState = CContextManager::Get()->GetCurrentContext();
+        }
+        else
+        {
+            wxDialogEx dlg;
+            if (dlg.Load(this, _T("ID_ALREADYCONNECTED")))
+            {
+                if (COptions::Get()->GetOptionVal(OPTION_ALREADYCONNECTED_CHOICE) != 0)
+                    XRCCTRL(dlg, "ID_OLDTAB", wxRadioButton)->SetValue(true);
+                else
+                    XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->SetValue(true);
 
-            if (dlg.ShowModal() != wxID_OK)
-                return false;
+                if (dlg.ShowModal() != wxID_OK)
+                    return false;
 
-            if (XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->GetValue())
-            {
-                m_pContextControl->CreateTab();
-                pState = CContextManager::Get()->GetCurrentContext();
-                COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, 0);
+                if (XRCCTRL(dlg, "ID_NEWTAB", wxRadioButton)->GetValue())
+                {
+                    m_pContextControl->CreateTab();
+                    pState = CContextManager::Get()->GetCurrentContext();
+                    COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, 0);
+                }
+                else
+                    COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, 1);
             }
-            else
-                COptions::Get()->SetOption(OPTION_ALREADYCONNECTED_CHOICE, 1);
         }
     }
 

src/interface/Mainfrm.h

@@ -56 +56 @@
 
     void PostInitialize();
     
-    bool ConnectToServer(const CServer& server, const CServerPath& path = CServerPath());
+    bool ConnectToServer(const CServer& server, const CServerPath& path = CServerPath(), bool newtab = false);
 
     CContextControl* GetContextControl() { return m_pContextControl; }
 
-    bool ConnectToSite(CSiteManagerItemData_Site* const pData);
+    bool ConnectToSite(CSiteManagerItemData_Site* const pData, bool newtab = false);
 
 protected:
     bool CreateMenus();