filepreview now does a partial preview of text files and shell scripts

SVN revision: 77370
This commit is contained in:
Mike Blumenkrantz 2012-10-03 14:21:02 +00:00
parent 0521c799fa
commit 491c50d8a5
1 changed files with 120 additions and 14 deletions

View File

@ -5,6 +5,8 @@
# include <Emotion.h>
#endif
#define FILEPREVIEW_TEXT_PREVIEW_SIZE 2048
typedef struct _E_Widget_Data E_Widget_Data;
struct _E_Widget_Data
{
@ -27,6 +29,7 @@ struct _E_Widget_Data
Evas_Object *o_preview_scrollframe;
Evas_Coord preview_w, preview_h;
int w, h;
Ecore_Thread *preview_text_file_thread;
char *preview_extra_text;
char *preview_size_text;
char *preview_owner_text;
@ -37,7 +40,9 @@ struct _E_Widget_Data
double vid_pct;
Eina_Bool mime_icon : 1;
Eina_Bool is_dir : 1;
Eina_Bool is_txt : 1;
Eina_Bool prev_is_fm : 1;
Eina_Bool prev_is_txt : 1;
Eina_Bool prev_is_video : 1;
};
@ -50,6 +55,7 @@ static char *_e_wid_file_time_get(time_t st_modtime);
static void _e_wid_fprev_img_update(E_Widget_Data *wd, const char *path, const char *key);
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_fprev_preview_reset(E_Widget_Data *wd);
static void _e_wid_fprev_preview_txt(E_Widget_Data *wd);
static void _e_wid_fprev_preview_fm(E_Widget_Data *wd);
static void
@ -123,7 +129,7 @@ static void
_e_wid_fprev_img_update(E_Widget_Data *wd, const char *path, const char *key)
{
if (!path) return;
if (wd->is_dir) return;
if (wd->is_dir || wd->is_txt) return;
e_widget_preview_thumb_set(wd->o_preview_preview, path, key, wd->w, wd->h);
}
@ -148,8 +154,10 @@ _e_wid_fprev_clear_widgets(E_Widget_Data *wd)
CLRWID(o_preview_time_entry);
CLRWID(o_preview_preview);
CLRWID(o_preview_scrollframe);
wd->prev_is_fm = wd->prev_is_video = EINA_FALSE;
wd->is_dir = wd->is_txt = wd->prev_is_fm = wd->prev_is_video = EINA_FALSE;
wd->vid_pct = 0;
if (wd->preview_text_file_thread) ecore_thread_cancel(wd->preview_text_file_thread);
wd->preview_text_file_thread = NULL;
}
#ifdef HAVE_EMOTION
@ -319,7 +327,7 @@ _e_wid_fprev_preview_fs_widgets(E_Widget_Data *wd)
}
static void
_e_wid_fprev_preview_file_widgets(E_Widget_Data *wd)
_e_wid_fprev_preview_file_widgets(E_Widget_Data *wd, Eina_Bool dir, Eina_Bool txt)
{
Evas *evas = evas_object_evas_get(wd->obj);
Evas_Object *o;
@ -339,10 +347,13 @@ _e_wid_fprev_preview_file_widgets(E_Widget_Data *wd)
o = e_widget_table_add(evas, 0);
e_widget_disabled_set(o, 1);
wd->o_preview_properties_table = o;
wd->is_dir = dir;
wd->is_txt = txt;
if (e_util_strcmp(wd->mime, "inode/directory"))
if (!dir)
{
WIDROW(_("Resolution:"), o_preview_extra, o_preview_extra_entry, 100);
if (!txt)
WIDROW(_("Resolution:"), o_preview_extra, o_preview_extra_entry, 100);
WIDROW(_("Size:"), o_preview_size, o_preview_size_entry, 100);
}
WIDROW(_("Owner:"), o_preview_owner, o_preview_owner_entry, 100);
@ -532,24 +543,33 @@ _e_wid_fprev_preview_file(E_Widget_Data *wd)
}
#endif
if (is_fs) return;
_e_wid_fprev_preview_file_widgets(wd);
wd->mime_icon = EINA_FALSE;
size = _e_wid_file_size_get(st.st_size);
owner = _e_wid_file_user_get(st.st_uid);
perms = _e_wid_file_perms_get(st.st_mode, st.st_uid, st.st_gid);
mtime = _e_wid_file_time_get(st.st_mtime);
wd->is_dir = S_ISDIR(st.st_mode);
if (wd->mime && st.st_size && (!wd->is_dir))
{
wd->is_txt = !strncmp(wd->mime, "text/", 5);
if (!wd->is_txt)
wd->is_txt = !strcmp(wd->mime, "application/x-shellscript");
}
_e_wid_fprev_preview_file_widgets(wd, wd->is_dir, wd->is_txt);
_e_wid_fprev_preview_reset(wd);
_e_wid_fprev_preview_fm(wd);
_e_wid_fprev_preview_txt(wd);
_e_wid_fprev_img_update(wd, wd->path, NULL);
e_widget_size_min_get(wd->o_preview_list, &mw, &mh);
e_widget_size_min_set(wd->obj, mw, mh);
if (e_util_strcmp(wd->mime, "inode/directory"))
if (!wd->is_dir)
{
e_widget_entry_text_set(wd->o_preview_extra_entry, "");
if (!wd->is_txt)
e_widget_entry_text_set(wd->o_preview_extra_entry, "");
e_widget_entry_text_set(wd->o_preview_size_entry, size);
}
e_widget_entry_text_set(wd->o_preview_owner_entry, owner);
@ -674,7 +694,8 @@ _e_wid_del_hook(Evas_Object *obj)
E_FREE(wd->preview_time_text);
eina_stringshare_del(wd->path);
eina_stringshare_del(wd->mime);
if (wd->preview_text_file_thread) ecore_thread_cancel(wd->preview_text_file_thread);
wd->preview_text_file_thread = NULL;
free(wd);
}
@ -682,15 +703,17 @@ static void
_e_wid_fprev_preview_reset(E_Widget_Data *wd)
{
Evas_Object *o;
if (wd->is_dir) return;
if (wd->o_preview_scrollframe && wd->prev_is_fm)
if (wd->o_preview_scrollframe && (wd->prev_is_fm || wd->prev_is_txt))
{
evas_object_del(wd->o_preview_scrollframe);
wd->o_preview_scrollframe = wd->o_preview_preview = NULL;
}
if (wd->preview_text_file_thread) ecore_thread_cancel(wd->preview_text_file_thread);
wd->preview_text_file_thread = NULL;
if (wd->o_preview_preview) return;
o = e_widget_preview_add(evas_object_evas_get(wd->obj), wd->w, wd->h);
wd->prev_is_fm = EINA_FALSE;
wd->prev_is_txt = wd->prev_is_fm = EINA_FALSE;
e_widget_disabled_set(o, 1);
wd->o_preview_preview = o;
evas_object_smart_callback_add(o, "preview_update",
@ -737,6 +760,89 @@ _e_wid_cb_file_deleted(void *data, Evas_Object *obj, void *event __UNUSED__)
evas_object_smart_callback_call(data, "files_deleted", obj);
}
static void
_e_wid_fprev_preview_txt_read_cancel(void *data __UNUSED__, Ecore_Thread *eth __UNUSED__)
{
}
static void
_e_wid_fprev_preview_txt_read_end(void *data __UNUSED__, Ecore_Thread *eth __UNUSED__)
{
}
static void
_e_wid_fprev_preview_txt_read_notify(void *data, Ecore_Thread *eth __UNUSED__, void *msg)
{
E_Widget_Data *wd = data;
//INF("text='%s'", (char*)msg);
edje_object_part_text_set(wd->o_preview_preview, "e.textblock.message", msg);
free(msg);
}
static void
_e_wid_fprev_preview_txt_read(void *data __UNUSED__, Ecore_Thread *eth)
{
char *text;
char buf[FILEPREVIEW_TEXT_PREVIEW_SIZE];
FILE *f;
text = ecore_thread_global_data_find("fprev_file");
if (!text) return;
f = fopen(text, "r");
if (!f) return;
fread(buf, sizeof(char), sizeof(buf), f);
ecore_thread_feedback(eth, evas_textblock_text_utf8_to_markup(NULL, buf));
fclose(f);
}
static void
_e_wid_fprev_preview_txt(E_Widget_Data *wd)
{
Evas_Object *o;
int mw;
if (!wd->is_txt) return;
if (!wd->path) return;
if (wd->o_preview_preview && (!wd->prev_is_txt))
{
evas_object_del(wd->o_preview_preview);
wd->o_preview_preview = NULL;
}
if (!wd->o_preview_preview)
{
Evas *evas;
evas = evas_object_evas_get(wd->obj);
o = edje_object_add(evas);
/* using dialog theme for now because it's simple, common, and doesn't require all
* themes to be updated
*/
e_theme_edje_object_set(o, "base/theme/dialog", "e/widgets/dialog/text");
wd->o_preview_preview = o;
wd->prev_is_txt = EINA_TRUE;
evas_object_resize(o, wd->w, wd->h);
o = e_widget_scrollframe_simple_add(evas, o);
wd->o_preview_scrollframe = o;
e_widget_size_min_get(wd->o_preview_list, &mw, NULL);
e_widget_size_min_set(o, wd->w, wd->h);
evas_object_propagate_events_set(wd->o_preview_preview, 0);
e_widget_table_object_append(wd->o_preview_preview_table,
o, 0, 0, 1, 1, 1, 1, 1, 1);
e_widget_list_object_repack(wd->o_preview_list,
wd->o_preview_preview_table,
1, 1, 0.5);
e_widget_list_object_repack(wd->o_preview_list,
wd->o_preview_properties_table,
1, 1, 0.5);
}
ecore_thread_global_data_del("fprev_file");
if (wd->preview_text_file_thread) ecore_thread_cancel(wd->preview_text_file_thread);
ecore_thread_global_data_add("fprev_file", strdup(wd->path), free, 0);
wd->preview_text_file_thread = ecore_thread_feedback_run(_e_wid_fprev_preview_txt_read, _e_wid_fprev_preview_txt_read_notify,
_e_wid_fprev_preview_txt_read_end, _e_wid_fprev_preview_txt_read_cancel, wd, EINA_FALSE);
}
static void
_e_wid_fprev_preview_fm(E_Widget_Data *wd)
{
@ -871,5 +977,5 @@ e_widget_filepreview_filemode_force(Evas_Object *obj)
if (!obj) return;
wd = e_widget_data_get(obj);
if (!wd) return;
_e_wid_fprev_preview_file_widgets(wd);
_e_wid_fprev_preview_file_widgets(wd, 0, 0);
}