X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29886d1bf86d6b2a87fdc8e485ffcc14f210ff23..d2e66707deb10dea6f92e3e4092f8a43ef942a5d:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index e186887124..caa9459875 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -16,7 +16,7 @@ #pragma hdrstop #endif -#if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE +#if wxUSE_MIMETYPE && wxUSE_FILE #include "wx/unix/mimetype.h" @@ -32,7 +32,6 @@ #include "wx/confbase.h" #include "wx/ffile.h" -#include "wx/textfile.h" #include "wx/dir.h" #include "wx/tokenzr.h" #include "wx/iconloc.h" @@ -46,43 +45,39 @@ class wxMimeTextFile { public: - wxMimeTextFile() + wxMimeTextFile() { } - + wxMimeTextFile(const wxString& fname) { m_fname = fname; } - - void AddLine( const wxString &line ) { } - - bool Open( const wxString &fname ) + + bool Open() { - m_fname = fname; - wxFFile file( fname ); + wxFFile file( m_fname ); if (!file.IsOpened()) return false; + size_t size = file.Length(); wxCharBuffer buffer( size ); file.Read( (void*) (const char*) buffer, size ); + + // Check for valid UTF-8 here? wxString all = wxString::FromUTF8( buffer, size ); - + wxStringTokenizer tok( all, "\n" ); while (tok.HasMoreTokens()) { wxString t = tok.GetNextToken(); t.MakeLower(); - if ((!!t) && (t.Find( "comment" ) != 0) && (t.Find( "generic" ) != 0)) + if ((!!t) && (t.Find( "comment" ) != 0) && (t.Find( "#" ) != 0) && (t.Find( "generic" ) != 0)) m_text.Add( t ); } return true; } - bool Open() { return Open(m_fname); } - bool Create( const wxString &fname ) { return false; } - bool Write() { return false; } - bool Close() { return false; } - + unsigned int GetLineCount() const { return m_text.GetCount(); } wxString &GetLine( unsigned int line ) { return m_text[line]; } @@ -104,29 +99,6 @@ public: return wxNOT_FOUND; } - bool CommentLine(int nIndex) - { - if (nIndex < 0) - return false; - if (nIndex >= (int)GetLineCount() ) - return false; - - GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#")); - return true; - } - - bool CommentLine(const wxString & sTest) - { - int nIndex = pIndexOf(sTest); - if (nIndex < 0) - return false; - if (nIndex >= (int)GetLineCount() ) - return false; - - GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#")); - return true; - } - wxString GetVerb(size_t i) { if (i > GetLineCount() ) @@ -144,7 +116,7 @@ public: wxString sTmp = GetLine(i).AfterFirst(wxT('=')); return sTmp; } - + private: wxArrayString m_text; wxString m_fname; @@ -157,170 +129,16 @@ private: // MIME code tracing mask #define TRACE_MIME wxT("mime") -// give trace messages about the results of mailcap tests -#define TRACE_MIME_TEST wxT("mimetest") - -// ---------------------------------------------------------------------------- -// ---------------------------------------------------------------------------- -// KDE -// ---------------------------------------------------------------------------- - - -// KDE stores the icon info in its .kdelnk files. The file for mimetype/subtype -// may be found in either of the following locations -// -// 1. $KDEDIR/share/mimelnk/mimetype/subtype.kdelnk -// 2. ~/.kde/share/mimelnk/mimetype/subtype.kdelnk -// -// The format of a .kdelnk file is almost the same as the one used by -// wxFileConfig, i.e. there are groups, comments and entries. The icon is the -// value for the entry "Type" - -// kde writing; see http://webcvs.kde.org/cgi-bin/cvsweb.cgi/~checkout~/kdelibs/kio/DESKTOP_ENTRY_STANDARD -// for now write to .kdelnk but should eventually do .desktop instead (in preference??) - -bool wxMimeTypesManagerImpl::CheckKDEDirsExist( const wxString &sOK, const wxString &sTest ) +// Read a XDG *.desktop file of type 'Application' +void wxMimeTypesManagerImpl::LoadXDGApp(const wxString& filename) { - if (sTest.empty()) - { - return wxDir::Exists(sOK); - } - else - { - wxString sStart = sOK + wxT("/") + sTest.BeforeFirst(wxT('/')); - if (!wxDir::Exists(sStart)) - wxMkdir(sStart); - wxString sEnd = sTest.AfterFirst(wxT('/')); - return CheckKDEDirsExist(sStart, sEnd); - } -} - -bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index) -{ - wxMimeTextFile appoutfile, mimeoutfile; - wxString sHome = wxGetHomeDir(); - wxString sTmp = wxT(".kde/share/mimelnk/"); - wxString sMime = m_aTypes[index]; - CheckKDEDirsExist(sHome, sTmp + sMime.BeforeFirst(wxT('/')) ); - sTmp = sHome + wxT('/') + sTmp + sMime + wxT(".kdelnk"); - - bool bTemp; - bool bMimeExists = mimeoutfile.Open(sTmp); - if (!bMimeExists) - { - bTemp = mimeoutfile.Create(sTmp); - // some unknown error eg out of disk space - if (!bTemp) - return false; - } - - sTmp = wxT(".kde/share/applnk/"); - CheckKDEDirsExist(sHome, sTmp + sMime.AfterFirst(wxT('/')) ); - sTmp = sHome + wxT('/') + sTmp + sMime.AfterFirst(wxT('/')) + wxT(".kdelnk"); - - bool bAppExists; - bAppExists = appoutfile.Open(sTmp); - if (!bAppExists) - { - bTemp = appoutfile.Create(sTmp); - // some unknown error eg out of disk space - if (!bTemp) - return false; - } - - // fixed data; write if new file - if (!bMimeExists) - { - mimeoutfile.AddLine(wxT("#KDE Config File")); - mimeoutfile.AddLine(wxT("[KDE Desktop Entry]")); - mimeoutfile.AddLine(wxT("Version=1.0")); - mimeoutfile.AddLine(wxT("Type=MimeType")); - mimeoutfile.AddLine(wxT("MimeType=") + sMime); - } - - if (!bAppExists) - { - mimeoutfile.AddLine(wxT("#KDE Config File")); - mimeoutfile.AddLine(wxT("[KDE Desktop Entry]")); - appoutfile.AddLine(wxT("Version=1.0")); - appoutfile.AddLine(wxT("Type=Application")); - appoutfile.AddLine(wxT("MimeType=") + sMime + wxT(';')); - } - - // variable data - // ignore locale - mimeoutfile.CommentLine(wxT("Comment=")); - if (!delete_index) - mimeoutfile.AddLine(wxT("Comment=") + m_aDescriptions[index]); - appoutfile.CommentLine(wxT("Name=")); - if (!delete_index) - appoutfile.AddLine(wxT("Comment=") + m_aDescriptions[index]); - - sTmp = m_aIcons[index]; - // we can either give the full path, or the shortfilename if its in - // one of the directories we search - mimeoutfile.CommentLine(wxT("Icon=") ); - if (!delete_index) - mimeoutfile.AddLine(wxT("Icon=") + sTmp ); - appoutfile.CommentLine(wxT("Icon=") ); - if (!delete_index) - appoutfile.AddLine(wxT("Icon=") + sTmp ); - - sTmp = wxT(" ") + m_aExtensions[index]; - - wxStringTokenizer tokenizer(sTmp, wxT(" ")); - sTmp = wxT("Patterns="); - mimeoutfile.CommentLine(sTmp); - while ( tokenizer.HasMoreTokens() ) - { - // holds an extension; need to change it to *.ext; - wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";"); - sTmp += e; - } - - if (!delete_index) - mimeoutfile.AddLine(sTmp); - - wxMimeTypeCommands * entries = m_aEntries[index]; - // if we don't find open just have an empty string ... FIX this - sTmp = entries->GetCommandForVerb(wxT("open")); - sTmp.Replace( wxT("%s"), wxT("%f") ); - - mimeoutfile.CommentLine(wxT("DefaultApp=") ); - if (!delete_index) - mimeoutfile.AddLine(wxT("DefaultApp=") + sTmp); - - sTmp.Replace( wxT("%f"), wxT("") ); - appoutfile.CommentLine(wxT("Exec=")); - if (!delete_index) - appoutfile.AddLine(wxT("Exec=") + sTmp); - - if (entries->GetCount() > 1) - { - //other actions as well as open - } + wxLogTrace(TRACE_MIME, wxT("loading XDG file %s"), filename.c_str()); - bTemp = false; - if (mimeoutfile.Write()) - bTemp = true; - mimeoutfile.Close(); - if (appoutfile.Write()) - bTemp = true; - appoutfile.Close(); - - return bTemp; -} - -// Read a KDE .desktop file of type 'Application' -void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) -{ - wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), filename.c_str()); - - wxMimeTextFile file; - if ( !file.Open(filename) ) + wxMimeTextFile file(filename); + if ( !file.Open() ) return; - + // Here, only type 'Application' should be considered. int nIndex = file.pIndexOf( "Type=" ); if (nIndex != wxNOT_FOUND && file.GetCmd(nIndex) != "application") @@ -343,7 +161,7 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) #if wxUSE_INTL // try "Name[locale name]" first wxLocale *locale = wxGetLocale(); if ( locale ) - nIndex = file.pIndexOf(_T("Name[")+locale->GetName()+_T("]=")); + nIndex = file.pIndexOf(wxT("Name[")+locale->GetName()+wxT("]=")); #endif // wxUSE_INTL if(nIndex == wxNOT_FOUND) nIndex = file.pIndexOf( wxT("Name=") ); @@ -355,7 +173,7 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) nIndex = wxNOT_FOUND; #if wxUSE_INTL // try "Icon[locale name]" first if ( locale ) - nIndex = file.pIndexOf(_T("Icon[")+locale->GetName()+_T("]=")); + nIndex = file.pIndexOf(wxT("Icon[")+locale->GetName()+wxT("]=")); #endif // wxUSE_INTL if(nIndex == wxNOT_FOUND) nIndex = file.pIndexOf( wxT("Icon=") ); @@ -380,7 +198,7 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) sCmd.Replace(wxT("%i"), nameicon); sCmd.Replace(wxT("%m"), namemini); - wxStringTokenizer tokenizer(mimetypes, _T(";")); + wxStringTokenizer tokenizer(mimetypes, wxT(";")); while(tokenizer.HasMoreTokens()) { wxString mimetype = tokenizer.GetNextToken().Lower(); nIndex = m_aTypes.Index(mimetype); @@ -391,7 +209,7 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) } } -void wxMimeTypesManagerImpl::LoadKDEAppsFilesFromDir(const wxString& dirname) +void wxMimeTypesManagerImpl::LoadXDGAppsFilesFromDir(const wxString& dirname) { // Don't complain if we don't have permissions to read - it confuses users wxLogNull logNull; @@ -404,28 +222,56 @@ void wxMimeTypesManagerImpl::LoadKDEAppsFilesFromDir(const wxString& dirname) wxString filename; // Look into .desktop files - bool cont = dir.GetFirst(&filename, _T("*.desktop"), wxDIR_FILES); + bool cont = dir.GetFirst(&filename, wxT("*.desktop"), wxDIR_FILES); while (cont) { wxFileName p(dirname, filename); - LoadKDEApp( p.GetFullPath() ); + LoadXDGApp( p.GetFullPath() ); cont = dir.GetNext(&filename); } - - return; - + +#if 0 + // RR: I'm not sure this makes any sense. On my system we'll just + // scan the YAST2 and other useless directories + // Look recursively into subdirs cont = dir.GetFirst(&filename, wxEmptyString, wxDIR_DIRS); while (cont) { wxFileName p(dirname, wxEmptyString); p.AppendDir(filename); - LoadKDEAppsFilesFromDir( p.GetPath() ); + LoadXDGAppsFilesFromDir( p.GetPath() ); cont = dir.GetNext(&filename); } +#endif } +void wxMimeTypesManagerImpl::LoadXDGGlobs(const wxString& filename) +{ + if ( !wxFileName::FileExists(filename) ) + return; + + wxLogTrace(TRACE_MIME, wxT("loading XDG globs file from %s"), filename.c_str()); + + wxMimeTextFile file(filename); + if ( !file.Open() ) + return; + + size_t i; + for (i = 0; i < file.GetLineCount(); i++) + { + wxStringTokenizer tok( file.GetLine(i), ":" ); + wxString mime = tok.GetNextToken(); + wxString ext = tok.GetNextToken(); + ext.Remove( 0, 2 ); + wxArrayString exts; + exts.Add( ext ); + + AddToMimeData(mime, wxEmptyString, NULL, exts, wxEmptyString, true ); + } +} + // ---------------------------------------------------------------------------- // wxFileTypeImpl (Unix) // ---------------------------------------------------------------------------- @@ -660,18 +506,25 @@ void wxMimeTypesManagerImpl::InitIfNeeded() { // set the flag first to prevent recursion m_initialized = true; - - wxString wm = wxTheApp->GetTraits()->GetDesktopEnvironment(); - - if (wm == wxT("KDE")) - Initialize( wxMAILCAP_KDE ); - else if (wm == wxT("GNOME")) - Initialize( wxMAILCAP_GNOME ); - else - Initialize(); + + int mailcapStyles = wxMAILCAP_ALL; + if ( wxAppTraits * const traits = wxApp::GetTraitsIfExists() ) + { + wxString wm = traits->GetDesktopEnvironment(); + + if ( wm == "KDE" ) + mailcapStyles = wxMAILCAP_KDE; + else if ( wm == "GNOME" ) + mailcapStyles = wxMAILCAP_GNOME; + //else: unknown, use the default + } + + Initialize(mailcapStyles); } } + + // read system and user mailcaps and other files void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, const wxString& sExtraDir) @@ -679,22 +532,37 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, #ifdef __VMS // XDG tables are never installed on OpenVMS return; -#endif +#else + + // Read MIME type - extension associations + LoadXDGGlobs( "/usr/share/mime/globs" ); + LoadXDGGlobs( "/usr/local/share/mime/globs" ); - // Load desktop files for Gnome, and then override them with the Gnome defaults. + // Load desktop files for XDG, and then override them with the defaults. // We will override them one desktop file at a time, rather // than one mime type at a time, but it should be a reasonable // heuristic. { - wxString xdgDataHome = wxGetenv(wxT("XDG_DATA_HOME")); + wxString xdgDataHome = wxGetenv("XDG_DATA_HOME"); if ( xdgDataHome.empty() ) - xdgDataHome = wxGetHomeDir() + wxT("/.local/share"); - wxString xdgDataDirs = wxGetenv(wxT("XDG_DATA_DIRS")); + xdgDataHome = wxGetHomeDir() + "/.local/share"; + wxString xdgDataDirs = wxGetenv("XDG_DATA_DIRS"); if ( xdgDataDirs.empty() ) - xdgDataDirs = wxT("/usr/local/share:/usr/share:/usr/share/gnome"); - wxArrayString dirs; + { + xdgDataDirs = "/usr/local/share:/usr/share"; + if (mailcapStyles & wxMAILCAP_GNOME) + xdgDataDirs += ":/usr/share/gnome:/opt/gnome/share"; + if (mailcapStyles & wxMAILCAP_KDE) + xdgDataDirs += ":/usr/share/kde3:/opt/kde3/share"; + } + if ( !sExtraDir.empty() ) + { + xdgDataDirs += ':'; + xdgDataDirs += sExtraDir; + } - wxStringTokenizer tokenizer(xdgDataDirs, wxT(":")); + wxArrayString dirs; + wxStringTokenizer tokenizer(xdgDataDirs, ":"); while ( tokenizer.HasMoreTokens() ) { wxString p = tokenizer.GetNextToken(); @@ -723,7 +591,7 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, wxString dirStr = dirs[nDir]; if (dirStr.Last() != '/') dirStr += '/'; dirStr += "applications"; - LoadKDEAppsFilesFromDir(dirStr); + LoadXDGAppsFilesFromDir(dirStr); } if (!defaultsList.IsEmpty()) @@ -740,9 +608,8 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, { if (textfile.GetLine(i).Find(wxT("=")) != wxNOT_FOUND) { - wxString mimeType = textfile.GetVerb(i); wxString desktopFile = textfile.GetCmd(i); - + if (deskTopFilesSeen.Index(desktopFile) == wxNOT_FOUND) { deskTopFilesSeen.Add(desktopFile); @@ -750,14 +617,12 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, for (j = 0; j < dirs.GetCount(); j++) { wxString desktopPath = dirs[j]; - if (desktopPath.Last() == '/') - desktopPath += "applications/"; - else - desktopPath += "/applications/"; + if (desktopPath.Last() != '/') desktopPath += '/'; + desktopPath += "applications/"; desktopPath += desktopFile; - + if (wxFileExists(desktopPath)) - LoadKDEApp(desktopPath); + LoadXDGApp(desktopPath); } } } @@ -766,6 +631,7 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, } } } +#endif } // clear data so you can read another group of WM files @@ -838,24 +704,7 @@ bool wxMimeTypesManagerImpl::DoAssociation(const wxString& strType, if ( nIndex == wxNOT_FOUND ) return false; - return WriteMimeInfo(nIndex, false); -} - -bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime ) -{ - bool ok = true; - - // Don't write GNOME files here as this is not - // allowed and simply doesn't work - - // if (m_mailcapStylesInited & wxMAILCAP_KDE) - { - // write in KDE format; - if (WriteKDEMimeFile(nIndex, delete_mime) ) - ok = false; - } - - return ok; + return true; } int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, @@ -874,16 +723,35 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, int nIndex = m_aTypes.Index(mimeType); if ( nIndex == wxNOT_FOUND ) { - // new file type - m_aTypes.Add(mimeType); - m_aIcons.Add(strIcon); - m_aEntries.Add(entry ? entry : new wxMimeTypeCommands); + // We put MIME types containing "application" at the end, so that + // if the MIME type for the extention "htm" is searched for, it will + // rather find "text/html" than "application/x-mozilla-bookmarks". + if (mimeType.Find( "application" ) == 0) + { + // new file type + m_aTypes.Add(mimeType); + m_aIcons.Add(strIcon); + m_aEntries.Add(entry ? entry : new wxMimeTypeCommands); - // change nIndex so we can use it below to add the extensions - m_aExtensions.Add(wxEmptyString); - nIndex = m_aExtensions.size() - 1; + // change nIndex so we can use it below to add the extensions + m_aExtensions.Add(wxEmptyString); + nIndex = m_aExtensions.size() - 1; - m_aDescriptions.Add(strDesc); + m_aDescriptions.Add(strDesc); + } + else + { + // new file type + m_aTypes.Insert(mimeType,0); + m_aIcons.Insert(strIcon,0); + m_aEntries.Insert(entry ? entry : new wxMimeTypeCommands,0); + + // change nIndex so we can use it below to add the extensions + m_aExtensions.Insert(wxEmptyString,0); + nIndex = 0; + + m_aDescriptions.Insert(strDesc,0); + } } else // yes, we already have it { @@ -1001,6 +869,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mim // first look for an exact match int index = m_aTypes.Index(mimetype); + if ( index != wxNOT_FOUND ) { fileType = new wxFileType; @@ -1142,7 +1011,6 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) } else { - WriteMimeInfo(nIndex, true); m_aTypes.RemoveAt(nIndex); m_aEntries.RemoveAt(nIndex); m_aExtensions.RemoveAt(nIndex); @@ -1160,4 +1028,4 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) } #endif - // wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE + // wxUSE_MIMETYPE && wxUSE_FILE