we can create links (hard links, symbolic links) now

added winix functions: ln

winix function 'default' can be used without redirecting now

added new tickets types: TypeProgress, TypeString, TypeMultistring, TypeImages, TypeFiles
now tickets are combined with files
added winix functions: showtickets

fixed mountpoints:
when the default root mount was created its parameter table was empty
and it caused accessing to a non-existing objects

fixed logger:
modifiers (log1, log2, log3) were incorrectly treated
added modifier: log4 (debug info)

now we are moving threads to a new plugin 'thread'
created directory: plugins/thread
(not finished yet)




git-svn-id: svn://ttmath.org/publicrep/winix/trunk@704 e52654a7-88a9-db11-a3e9-0013d4bc506e

core/thumb.cpp

@@ -7,17 +7,14 @@
  * 
  */
  
+#include <ctime>
 #include "thumb.h"
 #include "utf8.h"
 #include "log.h"
+#include "system.h"
 
 
 
-void Thumb::SetConvertCmd(const std::wstring & cmd)
-{
-	convert_cmd = cmd;
-}
-
 
 void Thumb::SetDb(Db * pdb)
 {
@@ -25,12 +22,22 @@ void Thumb::SetDb(Db * pdb)
 }
 
 
-// first thread (objects locked)
-void Thumb::CreateThumb(long item_id, const std::wstring & source, const std::wstring & dst, size_t cx, size_t cy, int aspect_mode)
+void Thumb::SetConfig(Config * pconfig)
 {
-	item_temp.item_id     = item_id;
-	item_temp.source      = source;
-	item_temp.dst         = dst;
+	config = pconfig;
+}
+
+
+void Thumb::SetSystem(System * psystem)
+{
+	system = psystem;
+}
+
+
+// first thread (objects locked)
+void Thumb::CreateThumb(const Item & item, size_t cx, size_t cy, int aspect_mode)
+{
+	item_temp.file        = item;
 	item_temp.cx          = cx;
 	item_temp.cy          = cy;
 	item_temp.aspect_mode = aspect_mode;
@@ -155,33 +162,107 @@ void Thumb::SelectAspect()
 }
 
 
-// second thread (objects are not locked)
-void Thumb::CreateThumbnail()
-{
-	command.Clear();
 
-	Ezc::WideToUTF8(convert_cmd, tempa);
+// second thread (objects are not locked)
+bool Thumb::CreateCommand()
+{
+bool res;
+
+	command.Clear();
+	stream_tmp_path.Clear();
+
+	Lock();
+
+	Ezc::WideToUTF8(config->convert_cmd, tempa);
 	command << tempa << " -quiet -strip -thumbnail ";
 	SelectAspect();
 	command << " ";
 
-	Ezc::WideToUTF8(item_work.source, tempa);
-	EscapePath(tempa);
-
-	Ezc::WideToUTF8(item_work.dst, tempa);
-	EscapePath(tempa);
-
-	if( system(command.CStr()) == 0 )
+	if( system->MakeFilePath(item_work.file, src_path) )
 	{
-		Lock();
-		log << log3 << "Thumb: created a thumbnail: " << tempa << logend;
-		db->EditHasThumbById(true, item_work.item_id);
-		Unlock();
+		Ezc::WideToUTF8(src_path, tempa);
+		EscapePath(tempa);
+
+		stream_tmp_path << config->upload_dir << L"/tmp/thumb_" << std::time(0);
+		Ezc::WideToUTF8(stream_tmp_path.Str(), string_tmp_patha);
+		EscapePath(string_tmp_patha);
+
+		res = true;
+	}
+	else
+	{
+		log << log1 << "Thumb: cannot create a source path" << logend;
+		res = false;
+	}
+
+	Unlock();
+
+return res;
+}
+
+
+
+// second thread (objects are not locked)
+void Thumb::SaveTmpThumbnail()
+{
+bool moved = false;
+
+	Lock();
+
+	// the file could have been changed especially when creating thumbnail lasted too long
+	iq.SetAll(false, false);
+	iq.sel_parent_id = true;
+	iq.sel_file      = true;
+	iq.sel_url       = true;
+	iq.sel_type      = true;
+	iq.WhereId(item_work.file.id);
+
+	if( db->GetItem(item_work.file, iq) == WINIX_ERR_OK )
+	{
+		if( system->MakeFilePath(item_work.file, dst_path, true, true, config->upload_dirs_chmod) )
+		{
+			if( RenameFile(stream_tmp_path.Str(), dst_path) )
+			{
+				log << log3 << "Thumb: created a thumbnail: " << dst_path << logend;
+				db->EditHasThumbById(true, item_work.file.id);
+				moved = true;
+			}
+			else
+			{
+				log << log1 << "Thumb: cannot move a temporary file: " << stream_tmp_path.Str() << ", to: " << dst_path << logend;
+			}
+		}
+		else
+		{
+			log << log1 << "Thumb: cannot create a destination path" << logend;
+		}
+	}
+
+	if( !moved )
+		::RemoveFile(stream_tmp_path.Str());
+
+	Unlock();
+}
+
+
+
+// second thread (objects are not locked)
+void Thumb::CreateThumbnail()
+{
+	if( !CreateCommand() )
+		return;
+
+	int res = std::system(command.CStr());
+
+	if( res == 0 )
+	{
+		SaveTmpThumbnail();
 	}
 	else
 	{
 		Lock();
-		log << log3 << "Thumb: some problems with creating a thumbnail: " << tempa << logend;
+		log << log3 << "Thumb: some problems with creating a thumbnail " << tempa
+			<< ", 'convert' process returned: " << res << logend;
 		Unlock();
 	}
 }