X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfea7acc199a2d57f444593f69b35181da34a34c..3ab296d9eb6d351eb1d2238f3e6ff2f5e6123861:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index 612ef88907..e2e68bd09a 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/mimetype.cpp +// Name: src/unix/mimetype.cpp // Purpose: classes and functions to manage MIME types // Author: Vadim Zeitlin // Modified by: @@ -27,130 +27,45 @@ // will be preserved during unassociate // 9) KDE does not yet handle multiple actions; Netscape mode never will -/* - TODO: this file is a mess, we need to split it and reformet/review - everything (VZ) - */ - -// ============================================================================ -// declarations -// ============================================================================ - -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- +// TODO: this file is a mess, we need to split it and review everything (VZ) // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop -#endif - -#ifndef WX_PRECOMP - #include "wx/defs.h" + #pragma hdrstop #endif #if wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE -#ifndef WX_PRECOMP - #include "wx/string.h" -#endif //WX_PRECOMP +#include "wx/unix/mimetype.h" +#ifndef WX_PRECOMP + #include "wx/dynarray.h" + #include "wx/string.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/utils.h" +#endif -#include "wx/log.h" #include "wx/file.h" -#include "wx/intl.h" -#include "wx/dynarray.h" #include "wx/confbase.h" #include "wx/ffile.h" #include "wx/textfile.h" #include "wx/dir.h" -#include "wx/utils.h" #include "wx/tokenzr.h" #include "wx/iconloc.h" #include "wx/filename.h" -#include "wx/unix/mimetype.h" +#if wxUSE_LIBGNOMEVFS + // Not GUI dependent + #include "wx/gtk/gnome/gvfs.h" +#endif // other standard headers #include -#ifdef __VMS -/* silence warnings for comparing unsigned int's <0 */ -# pragma message disable unscomzer -#endif - -// wxMimeTypeCommands stores the verbs defined for the given MIME type with -// their values -class wxMimeTypeCommands -{ -public: - wxMimeTypeCommands() {} - - wxMimeTypeCommands(const wxArrayString& verbs, - const wxArrayString& commands) - : m_verbs(verbs), - m_commands(commands) - { - } - - // add a new verb with the command or replace the old value - void AddOrReplaceVerb(const wxString& verb, const wxString& cmd) - { - int n = m_verbs.Index(verb, false /* ignore case */); - if ( n == wxNOT_FOUND ) - { - m_verbs.Add(verb); - m_commands.Add(cmd); - } - else - { - m_commands[n] = cmd; - } - } - - void Add(const wxString& s) - { - m_verbs.Add(s.BeforeFirst(wxT('='))); - m_commands.Add(s.AfterFirst(wxT('='))); - } - - // access the commands - size_t GetCount() const { return m_verbs.GetCount(); } - const wxString& GetVerb(size_t n) const { return m_verbs[n]; } - const wxString& GetCmd(size_t n) const { return m_commands[n]; } - - bool HasVerb(const wxString& verb) const - { return m_verbs.Index(verb) != wxNOT_FOUND; } - - wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const - { - wxString s; - - int n = m_verbs.Index(verb); - if ( n != wxNOT_FOUND ) - { - s = m_commands[(size_t)n]; - if ( idx ) - *idx = n; - } - - return s; - } - - // get a "verb=command" string - wxString GetVerbCmd(size_t n) const - { - return m_verbs[n] + wxT('=') + m_commands[n]; - } - -private: - wxArrayString m_verbs; - wxArrayString m_commands; -}; - // this class extends wxTextFile // // VZ: ??? @@ -159,7 +74,7 @@ class wxMimeTextFile : public wxTextFile public: // constructors wxMimeTextFile () : wxTextFile () {}; - wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) {}; + wxMimeTextFile(const wxString& strFile) : wxTextFile(strFile) {}; int pIndexOf(const wxString & sSearch, bool bIncludeComments = false, int iStart = 0) { @@ -180,6 +95,7 @@ public: sLine.MakeLower(); if (sLine.Contains(sTest)) nResult = (int) i; + i++; } } @@ -208,6 +124,7 @@ public: return false; if (nIndex >= (int)GetLineCount() ) return false; + GetLine(nIndex) = GetLine(nIndex).Prepend(wxT("#")); return true; } @@ -354,205 +271,16 @@ static bool IsKnownUnimportantField(const wxString& field); // 1. xxx.keys files under /usr/share/mime-info // 2. xxx.keys files under ~/.gnome/mime-info // -// The format of xxx.keys file is the following: -// -// mimetype/subtype: -// field=value -// -// with blank lines separating the entries and indented lines starting with -// TABs. We're interested in the field icon-filename whose value is the path -// containing the icon. -// // Update (Chris Elliott): apparently there may be an optional "[lang]" prefix // just before the field name. -bool wxMimeTypesManagerImpl::CheckGnomeDirsExist () -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - wxString sTmp = gnomedir; - sTmp = sTmp + wxT("/.gnome"); - if (! wxDir::Exists ( sTmp ) ) - { - if (!wxMkdir ( sTmp )) - { - wxLogError(wxT("Failed to create directory %s/.gnome."), sTmp.c_str()); - return false; - } - } - sTmp = sTmp + wxT("/mime-info"); - if (! wxDir::Exists ( sTmp ) ) - { - if (!wxMkdir ( sTmp )) - { - wxLogError(wxT("Failed to create directory %s/mime-info."), sTmp.c_str()); - return false; - } - } - - return true; -} - -bool wxMimeTypesManagerImpl::WriteGnomeKeyFile(int index, bool delete_index) -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - - wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.keys")); - // if this fails probably Gnome is not installed ?? - // create it anyway as a private mime store - -#if defined(__WXGTK20__) && wxUSE_UNICODE - if (! outfile.Open ( wxConvUTF8) ) -#else - if (! outfile.Open () ) -#endif - { - if (delete_index) - return false; - if (!CheckGnomeDirsExist() ) - return false; - - outfile.Create(); - } - - wxString sTmp, strType = m_aTypes[index]; - int nIndex = outfile.pIndexOf(strType); - if ( nIndex == wxNOT_FOUND ) - { - outfile.AddLine ( strType + wxT(':') ); - // see file:/usr/doc/gnome-libs-devel-1.0.40/devel-docs/mime-type-handling.txt - // as this does not deal with internationalisation - // wxT( "\t[en_US]") + verb + wxT ('=') + cmd + wxT(" %f"); - wxMimeTypeCommands * entries = m_aEntries[index]; - size_t count = entries->GetCount(); - for ( size_t i = 0; i < count; i++ ) - { - sTmp = entries->GetVerbCmd(i); - sTmp.Replace( wxT("%s"), wxT("%f") ); - sTmp = wxT( "\t") + sTmp; - outfile.AddLine( sTmp ); - } - //for international use do something like this - //outfile.AddLine ( wxString( "\t[en_US]icon-filename=") + cmd ); - outfile.AddLine( wxT( "\ticon-filename=") + m_aIcons[index] ); - } - else - { - if (delete_index) - outfile.CommentLine(nIndex); - - wxMimeTypeCommands sOld; - size_t nOld = nIndex + 1; - bool oldEntryEnd = false; - while ( (nOld < outfile.GetLineCount() )&& (!oldEntryEnd)) - { - sTmp = outfile.GetLine(nOld); - if ( (sTmp[0u] == wxT('\t')) || (sTmp[0u] == wxT('#')) ) - { - // we have another line to deal with - outfile.CommentLine(nOld); - nOld ++; - - // add the line to our store - if ((!delete_index) && (sTmp[0u] == wxT('\t'))) - sOld.Add(sTmp); - } - // next mimetpye ?? or blank line - else - oldEntryEnd = true; - } - - // list of entries in our data; these should all be in sOld, - // though sOld may also contain other entries , eg flags - if (!delete_index) - { - wxMimeTypeCommands * entries = m_aEntries[index]; - size_t i; - for (i=0; i < entries->GetCount(); i++) - { - // replace any entries in sold that match verbs we know - sOld.AddOrReplaceVerb( entries->GetVerb(i), entries->GetCmd(i) ); - } - - //sOld should also contain the icon - if ( !m_aIcons[index].empty() ) - sOld.AddOrReplaceVerb( wxT("icon-filename"), m_aIcons[index] ); - - for (i=0; i < sOld.GetCount(); i++) - { - sTmp = sOld.GetVerbCmd(i); - sTmp.Replace( wxT("%s"), wxT("%f") ); - sTmp = wxT("\t") + sTmp; - nIndex ++; - outfile.InsertLine( sTmp, nIndex ); - } - } - } - - bool bTmp = outfile.Write(); - return bTmp; -} - - -bool wxMimeTypesManagerImpl::WriteGnomeMimeFile(int index, bool delete_index) -{ - wxString gnomedir; - wxGetHomeDir( &gnomedir ); - - wxMimeTextFile outfile( gnomedir + wxT("/.gnome/mime-info/user.mime")); - // if this fails probably Gnome is not installed ?? - // create it anyway as a private mime store - if (! outfile.Open() ) - { - if (delete_index) - return false; - if (!CheckGnomeDirsExist() ) - return false; - - outfile.Create(); - } - - wxString strType = m_aTypes[index]; - int nIndex = outfile.pIndexOf(strType); - if ( nIndex == wxNOT_FOUND ) - { - outfile.AddLine( strType ); - outfile.AddLine( wxT("\text:") + m_aExtensions.Item(index) ); - } - else - { - if (delete_index) - { - outfile.CommentLine(nIndex); - outfile.CommentLine(nIndex+1); - } - else - { - // check for next line being the right one to replace ?? - wxString sOld = outfile.GetLine(nIndex+1); - if (sOld.Contains( wxT("\text: "))) - { - outfile.GetLine(nIndex+1) = wxT("\text: ") + m_aExtensions.Item(index); - } - else - { - outfile.InsertLine( wxT("\text: ") + m_aExtensions.Item(index), nIndex + 1 ); - } - } - } - - bool bTmp = outfile.Write(); - return bTmp; -} - void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, const wxArrayString& dirs) { wxTextFile textfile(filename); #if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !textfile.Open(wxConvUTF8) ) + if ( !textfile.Open(wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)) ) #else if ( !textfile.Open() ) #endif @@ -561,72 +289,103 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, wxLogTrace(TRACE_MIME, wxT("--- Opened Gnome file %s ---"), filename.c_str()); + wxArrayString search_dirs( dirs ); + // values for the entry being parsed wxString curMimeType, curIconFile; wxMimeTypeCommands * entry = new wxMimeTypeCommands; - // these are always empty in this file wxArrayString strExtensions; wxString strDesc; const wxChar *pc; size_t nLineCount = textfile.GetLineCount(); size_t nLine = 0; - while ( nLine < nLineCount) + while ( nLine < nLineCount ) { pc = textfile[nLine].c_str(); if ( *pc != wxT('#') ) { wxLogTrace(TRACE_MIME, wxT("--- Reading from Gnome file %s '%s' ---"), - filename.c_str(),pc); + filename.c_str(), pc); + + // trim trailing space and tab + while ((*pc == wxT(' ')) || (*pc == wxT('\t'))) + pc++; wxString sTmp(pc); - if (sTmp.Contains(wxT("=")) ) + int equal_pos = sTmp.Find( wxT('=') ); + if (equal_pos > 0) { - if (sTmp.Contains( wxT("icon-filename=") ) ) - { - // GNOME 1: - curIconFile = sTmp.AfterFirst(wxT('=')); - } - else if (sTmp.Contains( wxT("icon_filename=") ) ) + wxString left_of_equal = sTmp.Left( equal_pos ); + const wxChar *right_of_equal = pc; + right_of_equal += equal_pos+1; + + if (left_of_equal == wxT("icon_filename")) { // GNOME 2: - curIconFile = sTmp.AfterFirst(wxT('=')); + curIconFile = right_of_equal; - if (!wxFileExists(curIconFile)) + wxFileName newFile( curIconFile ); + if (newFile.IsRelative() || newFile.FileExists()) { - size_t nDirs = dirs.GetCount(); + size_t nDirs = search_dirs.GetCount(); + for (size_t nDir = 0; nDir < nDirs; nDir++) { - wxFileName newFile( curIconFile ); - newFile.SetPath( dirs[nDir] ); + newFile.SetPath( search_dirs[nDir] ); newFile.AppendDir( wxT("pixmaps") ); newFile.AppendDir( wxT("document-icons") ); newFile.SetExt( wxT("png") ); if (newFile.FileExists()) + { curIconFile = newFile.GetFullPath(); + // reorder search_dirs for speedup (fewer + // calls to FileExist() required) + if (nDir != 0) + { + wxString tmp = search_dirs[nDir]; + search_dirs.RemoveAt( nDir ); + search_dirs.Insert( tmp, 0 ); + } + break; + } } } } - else //: some other field, + else if (left_of_equal == wxT("open")) + { + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("open=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("view")) { - //may contain lines like this (RH7) - // \t[lang]open.tex."TeX this file"=tex %f - // \tflags.tex.flags=needsterminal - // \topen.latex."LaTeX this file"=latex %f - // \tflags.latex.flags=needsterminal - - // \topen=xdvi %f - // \tview=xdvi %f - // \topen.convert.Convert file to Postscript=dvips %f -o `basename %f .dvi`.ps - - // for now ignore lines with flags in...FIX - sTmp = sTmp.AfterLast(wxT(']')); - sTmp = sTmp.AfterLast(wxT('\t')); - sTmp.Trim(false).Trim(); - if (0 == sTmp.Replace( wxT("%f"), wxT("%s") )) - sTmp = sTmp + wxT(" %s"); + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("view=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("print")) + { + sTmp = right_of_equal; + sTmp.Replace( wxT("%f"), wxT("%s") ); + sTmp.Prepend( wxT("print=") ); + entry->Add(sTmp); + } + else if (left_of_equal == wxT("description")) + { + strDesc = right_of_equal; + } + else if (left_of_equal == wxT("short_list_application_ids_for_novice_user_level")) + { + sTmp = right_of_equal; + if (sTmp.Contains( wxT(",") )) + sTmp = sTmp.BeforeFirst( wxT(',') ); + sTmp.Prepend( wxT("open=") ); + sTmp.Append( wxT(" %s") ); entry->Add(sTmp); } @@ -640,7 +399,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, // overwrite any existing data if (! curMimeType.empty()) { - AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc); + AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc ); // now get ready for next bit entry = new wxMimeTypeCommands; @@ -652,15 +411,15 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename, } // end of not a comment // ignore blank lines - nLine ++; + nLine++; } // end of while, save any data - if (! curMimeType.empty()) + if ( curMimeType.empty() ) + delete entry; + else AddToMimeData( curMimeType, curIconFile, entry, strExtensions, strDesc); } - - void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& filename) { wxTextFile textfile(filename); @@ -707,7 +466,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file if ( !pc ) { - // the end - this can only happen if nLine == nLineCount + // the end: this can only happen if nLine == nLineCount break; } @@ -789,7 +548,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir( cont = dir.GetNext(&filename); } - // Hack alert: We scan all icons and deduce the + // FIXME: Hack alert: We scan all icons and deduce the // mime-type from the file name. dirname = dirbase; dirname << wxT("/pixmaps/document-icons"); @@ -800,7 +559,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir( if ( !wxDir::Exists(dirname) ) { - // Jst test for default GPE dir also + // Just test for default GPE dir also dirname = wxT("/usr/share/gpe/pixmaps/default/filemanager/document-icons"); if ( !wxDir::Exists(dirname) ) @@ -814,7 +573,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeFilesFromDir( { wxString mimeType = filename; mimeType.Remove( 0, 6 ); // remove "gnome-" - mimeType.Remove( mimeType.Len()-4, 4 ); // remove ".png" + mimeType.Remove( mimeType.Len() - 4, 4 ); // remove ".png" int pos = mimeType.Find( wxT("-") ); if (pos != wxNOT_FOUND) { @@ -958,7 +717,7 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index) mimeoutfile.CommentLine(wxT("Icon=") ); if (!delete_index) mimeoutfile.AddLine(wxT("Icon=") + sTmp ); - appoutfile.CommentLine(wxT("Icon=") ); + appoutfile.CommentLine(wxT("Icon=") ); if (!delete_index) appoutfile.AddLine(wxT("Icon=") + sTmp ); @@ -1017,7 +776,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, return; wxLogTrace(TRACE_MIME, wxT("loading KDE file %s"), - (dirbase+filename).c_str()); + (dirbase + filename).c_str()); wxMimeTypeCommands * entry = new wxMimeTypeCommands; wxArrayString sExts; @@ -1038,6 +797,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, nIndex = wxNOT_FOUND; wxString comment; + #if wxUSE_INTL wxLocale *locale = wxGetLocale(); if ( locale ) @@ -1046,7 +806,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, comment << wxT("Comment[") + locale->GetName() + wxT("]="); nIndex = file.pIndexOf(comment); } -#endif // wxUSE_INTL +#endif if ( nIndex == wxNOT_FOUND ) { @@ -1070,8 +830,10 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, while ( tokenizer.HasMoreTokens() ) { wxString e = tokenizer.GetNextToken(); + + // don't support too difficult patterns if ( e.Left(2) != wxT("*.") ) - continue; // don't support too difficult patterns + continue; if ( !mime_extension.empty() ) { @@ -1091,9 +853,10 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, if ( nIndex != wxNOT_FOUND ) { strIcon = file.GetCmd(nIndex); + wxLogTrace(TRACE_MIME, wxT(" icon %s"), strIcon.c_str()); - //it could be the real path, but more often a short name + // it could be the real path, but more often a short name if (!wxFileExists(strIcon)) { // icon is just the short name @@ -1131,8 +894,8 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase, if ( nIndex != wxNOT_FOUND ) { - wxString sTmp = file.GetCmd(nIndex); // we expect %f; others including %F and %U and %u are possible + wxString sTmp = file.GetCmd(nIndex); if (0 == sTmp.Replace( wxT("%f"), wxT("%s") )) sTmp = sTmp + wxT(" %s"); entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp ); @@ -1238,7 +1001,7 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir) if (configFile.FileExists() && config.Open(configFile.GetFullPath())) { // $(KDEDIR)/share/config -> $(KDEDIR)/share - configFile.RemoveDir( configFile.GetDirCount()-1 ); + configFile.RemoveDir( configFile.GetDirCount() - 1 ); // $(KDEDIR)/share/ -> $(KDEDIR)/share/icons configFile.AppendDir( wxT("icons") ); @@ -1271,7 +1034,7 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir) // Just try a few likely icons theme names - int pos = configFile.GetDirCount()-3; + int pos = configFile.GetDirCount() - 3; if (!wxDir::Exists(configFile.GetPath())) { @@ -1388,7 +1151,7 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, // verbs and commands have been cleared already in mimecmn.cpp... // if we find no entries in the exact match, try the inexact match - for (size_t n = 0; ((count ==0) && (n < m_index.GetCount())); n++) + for (size_t n = 0; ((count == 0) && (n < m_index.GetCount())); n++) { // list of verb = command pairs for this mimetype sPairs = m_manager->m_aEntries [m_index[n]]; @@ -1396,22 +1159,26 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, for ( i = 0; i < sPairs->GetCount(); i++ ) { vrb = sPairs->GetVerb(i); - // some gnome entries have . inside + // some gnome entries have "." inside vrb = vrb.AfterLast(wxT('.')); cmd = sPairs->GetCmd(i); if (! cmd.empty() ) { cmd = wxFileType::ExpandCommand(cmd, params); - count ++; + count++; if ( vrb.IsSameAs(wxT("open"))) { - verbs->Insert(vrb, 0u); - commands ->Insert(cmd, 0u); + if ( verbs ) + verbs->Insert(vrb, 0u); + if ( commands ) + commands ->Insert(cmd, 0u); } else { - verbs->Add(vrb); - commands->Add(cmd); + if ( verbs ) + verbs->Add(vrb); + if ( commands ) + commands->Add(cmd); } } } @@ -1436,8 +1203,8 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) extensions.Add(strExt); strExt.Empty(); } - //else: repeated spaces (shouldn't happen, but it's not that - // important if it does happen) + //else: repeated spaces + // (shouldn't happen, but it's not that important if it does happen) if ( *p == wxT('\0') ) break; @@ -1460,7 +1227,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) return true; } -// set an arbitrary command, +// set an arbitrary command: // could adjust the code to ask confirmation if it already exists and // overwriteprompt is true, but this is currently ignored as *Associate* has // no overwrite prompt @@ -1472,17 +1239,16 @@ wxFileTypeImpl::SetCommand(const wxString& cmd, wxArrayString strExtensions; wxString strDesc, strIcon; - wxMimeTypeCommands *entry = new wxMimeTypeCommands(); - entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); - wxArrayString strTypes; GetMimeTypes(strTypes); - if (strTypes.GetCount() < 1) + if ( strTypes.IsEmpty() ) return false; - size_t i; + wxMimeTypeCommands *entry = new wxMimeTypeCommands(); + entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); + bool ok = true; - for (i = 0; i < strTypes.GetCount(); i++) + for ( size_t i = 0; i < strTypes.GetCount(); i++ ) { if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) ok = false; @@ -1500,19 +1266,26 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index) wxArrayString strExtensions; wxString strDesc; - wxMimeTypeCommands *entry = new wxMimeTypeCommands(); - wxArrayString strTypes; GetMimeTypes(strTypes); - if (strTypes.GetCount() < 1) + if ( strTypes.IsEmpty() ) return false; - size_t i; + wxMimeTypeCommands *entry = new wxMimeTypeCommands(); bool ok = true; - for (i = 0; i < strTypes.GetCount(); i++) + for ( size_t i = 0; i < strTypes.GetCount(); i++ ) { - if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) + if ( !m_manager->DoAssociation + ( + strTypes[i], + strIcon, + entry, + strExtensions, + strDesc + ) ) + { ok = false; + } } return ok; @@ -1522,7 +1295,6 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index) // wxMimeTypesManagerImpl (Unix) // ---------------------------------------------------------------------------- - wxMimeTypesManagerImpl::wxMimeTypesManagerImpl() { m_initialized = false; @@ -1536,18 +1308,14 @@ void wxMimeTypesManagerImpl::InitIfNeeded() // set the flag first to prevent recursion m_initialized = true; -#if 1 - Initialize(); -#else wxString wm = wxGetenv( wxT("WINDOWMANAGER") ); if (wm.Find( wxT("kde") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_KDE | wxMAILCAP_STANDARD ); + Initialize( wxMAILCAP_KDE ); else if (wm.Find( wxT("gnome") ) != wxNOT_FOUND) - Initialize( wxMAILCAP_GNOME | wxMAILCAP_STANDARD ); + Initialize( wxMAILCAP_GNOME ); else Initialize(); -#endif } } @@ -1649,7 +1417,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index) wxMimeTextFile file; if ( wxFile::Exists(strUserMailcap) ) { - bTemp = file.Open(strUserMailcap); + bTemp = file.Open(strUserMailcap); } else { @@ -1666,7 +1434,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index) nIndex = file.pIndexOf(wxT("#--Netscape")); if (nIndex != wxNOT_FOUND) { - wxASSERT_MSG(false,wxT("Error in .mime.types \nTrying to mix Netscape and Metamail formats\nFile not modiifed")); + wxFAIL_MSG(wxT("Error in .mime.types\nTrying to mix Netscape and Metamail formats\nFile not modified")); return false; } @@ -1682,7 +1450,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index) if (!delete_index) { // add the new entries in - wxString sTmp = strType.Append(wxT(' '), 40-strType.Len() ); + wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() ); sTmp = sTmp + m_aExtensions[index]; file.AddLine(sTmp); } @@ -1709,7 +1477,7 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes(int index, bool delete_index) wxMimeTextFile file; if ( wxFile::Exists(strUserMailcap) ) { - bTemp = file.Open(strUserMailcap); + bTemp = file.Open(strUserMailcap); } else { @@ -1733,7 +1501,7 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes(int index, bool delete_index) // metamail entreies if (file.GetLineCount() > 0) { - wxASSERT_MSG(false, wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap")); + wxFAIL_MSG(wxT(".mime.types File not in Netscape format\nNo entries written to\n.mime.types or to .mailcap")); return false; } @@ -1773,16 +1541,16 @@ bool wxMimeTypesManagerImpl::WriteToNSMimeTypes(int index, bool delete_index) sTmp = wxT("desc=\"") + m_aDescriptions[index]+ wxT("\" \\"); //.trim ?? if (!delete_index) { - nIndex ++; + nIndex++; file.InsertLine(sTmp, nIndex); } } - wxString sExts = m_aExtensions.Item(index); + wxString sExts = m_aExtensions.Item(index); sTmp = wxT("exts=\"") + sExts.Trim(false).Trim() + wxT("\""); if (!delete_index) { - nIndex ++; + nIndex++; file.InsertLine(sTmp, nIndex); } @@ -1800,7 +1568,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) ( m_mailcapStylesInited & wxMAILCAP_STANDARD) ) ) return false; - bool bTemp; + bool bTemp = false; wxString strHome = wxGetenv(wxT("HOME")); // and now the users mailcap @@ -1809,7 +1577,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) wxMimeTextFile file; if ( wxFile::Exists(strUserMailcap) ) { - bTemp = file.Open(strUserMailcap); + bTemp = file.Open(strUserMailcap); } else { @@ -1830,6 +1598,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) sTmp = m_aTypes[index]; wxString sOld; int nIndex = file.pIndexOf(sTmp); + // get rid of all the unwanted entries... if (nIndex == wxNOT_FOUND) { @@ -1846,6 +1615,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) if (nIndex < (int) file.GetLineCount()) sOld = sOld + file[nIndex]; } + if (nIndex < (int) file.GetLineCount()) file.CommentLine(nIndex); } @@ -1853,7 +1623,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s "); // write it in the format that Netscape uses (default) - if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) ) + if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) ) { if (! delete_index) file.InsertLine(sTmp, nIndex); @@ -1886,7 +1656,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) bKnownToken = true; if (s.Contains(wxT("x11-bitmap="))) bKnownToken = true; - + size_t i; for (i=0; i < entries->GetCount(); i++) { @@ -1909,7 +1679,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) { sTmp = sTmp + wxT("; \\"); file.InsertLine(sTmp, nIndex); - nIndex ++; + nIndex++; sTmp = wxT(" description=\"") + m_aDescriptions[index] + wxT("\""); } @@ -1917,7 +1687,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) { sTmp = sTmp + wxT("; \\"); file.InsertLine(sTmp, nIndex); - nIndex ++; + nIndex++; sTmp = wxT(" x11-bitmap=\"") + m_aIcons[index] + wxT("\""); } @@ -1929,7 +1699,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index) { sTmp = sTmp + wxT("; \\"); file.InsertLine(sTmp, nIndex); - nIndex ++; + nIndex++; sTmp = wxT(" ") + entries->GetVerbCmd(i); } } @@ -1971,7 +1741,7 @@ wxFileType * wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) // clean up to just a space before and after sExt.Trim().Trim(false); sExt = wxT(' ') + sExt + wxT(' '); - for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex ++) + for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex++) { sExtStore = m_aExtensions.Item(nIndex); if (sExtStore.Replace(sExt, wxT(" ") ) > 0) @@ -2019,13 +1789,8 @@ bool wxMimeTypesManagerImpl::WriteMimeInfo(int nIndex, bool delete_mime ) ok = false; } - if (m_mailcapStylesInited & wxMAILCAP_GNOME) - { - // write in Gnome format; - if (WriteGnomeMimeFile(nIndex, delete_mime) ) - if (WriteGnomeKeyFile(nIndex, delete_mime) ) - ok = false; - } + // Don't write GNOME files here as this is not + // allowed and simply doesn't work if (m_mailcapStylesInited & wxMAILCAP_KDE) { @@ -2095,7 +1860,7 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, // add any new entries... if ( entry ) { - wxMimeTypeCommands *entryOld = m_aEntries[nIndex]; + wxMimeTypeCommands *entryOld = m_aEntries[nIndex]; size_t count = entry->GetCount(); for ( size_t i = 0; i < count; i++ ) @@ -2167,8 +1932,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromExtension(const wxString& ex return NULL; } -wxFileType * -wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) +wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) { InitIfNeeded(); @@ -2214,7 +1978,6 @@ wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mimeType) return fileType; } - wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex) const { wxString command, testcmd, sV, sTmp; @@ -2308,7 +2071,7 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) wxTextFile file(strFileName); #if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !file.Open( wxConvUTF8) ) + if ( !file.Open(wxConvUTF8) ) #else if ( !file.Open() ) #endif @@ -2386,8 +2149,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) pEnd = wxStrchr(++pc, wxT('"')); if ( pEnd == NULL ) { - wxLogWarning(wxT("Mime.types file %s, line %d: unterminated quoted string."), - strFileName.c_str(), nLine + 1); + wxLogWarning(wxT("Mime.types file %s, line %lu: unterminated quoted string."), + strFileName.c_str(), nLine + 1L); } } else @@ -2444,8 +2207,8 @@ bool wxMimeTypesManagerImpl::ReadMimeTypes(const wxString& strFileName) // unregistered extensions according to the standard practice, // but it may be worth telling the user about other junk in // his mime.types file - wxLogWarning(wxT("Unknown field in file %s, line %d: '%s'."), - strFileName.c_str(), nLine + 1, strLHS.c_str()); + wxLogWarning(wxT("Unknown field in file %s, line %lu: '%s'."), + strFileName.c_str(), nLine + 1L, strLHS.c_str()); } if ( !entryEnded ) @@ -2605,7 +2368,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, wxTextFile file(strFileName); #if defined(__WXGTK20__) && wxUSE_UNICODE - if ( !file.Open( wxConvUTF8) ) + if ( !file.Open(wxConvUTF8) ) #else if ( !file.Open() ) #endif @@ -2671,7 +2434,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, wxLogDebug(wxT("Mailcap file %s, line %lu: '\\' on the end of the last line ignored."), strFileName.c_str(), - (unsigned long)nLine + 1); + nLine + 1L); } else { @@ -2735,7 +2498,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, ( wxT("Mailcap file %s, line %lu: unknown field '%s' for the MIME type '%s' ignored."), strFileName.c_str(), - (unsigned long)nLine + 1, + nLine + 1L, curField.c_str(), data.type.c_str() ); @@ -2772,14 +2535,13 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, // check that we really read something reasonable if ( currentToken < Field_Other ) { - wxLogWarning(wxT("Mailcap file %s, line %d: incomplete entry ignored."), - strFileName.c_str(), nLine + 1); + wxLogWarning(wxT("Mailcap file %s, line %lu: incomplete entry ignored."), + strFileName.c_str(), nLine + 1L); continue; } - // if the test command failed, it's as if the entry were not there at - // all + // if the test command failed, it's as if the entry were not there at all if ( data.testfailed ) { continue; @@ -2881,6 +2643,8 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes) bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) { + InitIfNeeded(); + wxArrayString sMimeTypes; ft->GetMimeTypes(sMimeTypes); @@ -2939,4 +2703,3 @@ static bool IsKnownUnimportantField(const wxString& fieldAll) #endif // wxUSE_MIMETYPE && wxUSE_FILE && wxUSE_TEXTFILE -