tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Item class has been moved to a new directory 'models', a new class has been added: ItemContent

Browse Source 
and same fields from Item were moved to ItemContent

Item
- id
- parent_id
- type (file, dir, symlink)
- url
- subject
- template (html template)
- sort_index
- content_id

ItemContent
- id
- ref -> references (renamed)
- user_id
- modification_user_id
- group_id
- privileges
- date_creation
- date_modification
- guest_name
- link_to
- link_redirect
- file_path
- file_fs
- file_type
- file_size
- has_thumb -> file_has_thumb (renamed)
- hash -> file_hash (renamed)
- hash_type -> file_hash_type (renamed)
- content -> content_raw (renamed)
- content_type -> content_raw_type (renamed)
- content_parsed
- content_parsed_type
- meta
- ameta -> meta_admin (renamed)
- modify_index (removed)

WIP: #4
This commit is contained in:
Tomasz Sowa
2021-02-24 01:19:47 +01:00
parent 3d7ece15f8
commit 32e93a04c5
118 changed files with 5795 additions and 4514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
winixd/plugins/export/Makefile.dep
View File

@@ -5,13 +5,12 @@ edb.o: ../../../../winix/winixd/db/dbconn.h
edb.o: ../../../../winix/winixd/db/dbtextstream.h
edb.o: ../../../../winix/winixd/core/textstream.h
edb.o: ../../../../winix/winixd/core/misc.h
edb.o: ../../../../winix/winixd/core/item.h
edb.o: ../../../../winix/winixd/core/requesttypes.h
edb.o: ../../../../pikotools/textstream/textstream.h
edb.o: ../../../../pikotools/space/space.h
edb.o: ../../../../pikotools/textstream/types.h
edb.o: ../../../../pikotools/date/date.h
edb.o: ../../../../pikotools/convert/inttostr.h
edb.o: ../../../../winix/winixd/core/requesttypes.h
edb.o: ../../../../pikotools/textstream/textstream.h
edb.o: ../../../../pikotools/membuffer/membuffer.h
edb.o: ../../../../pikotools/textstream/types.h
edb.o: ../../../../pikotools/utf8/utf8.h
@@ -37,9 +36,20 @@ edb.o: ../../../../winix/winixd/core/error.h export.h
edb.o: ../../../../winix/winixd/core/dirs.h
edb.o: ../../../../winix/winixd/core/dircontainer.h
edb.o: ../../../../winix/winixd/core/winixbase.h
edb.o: ../../../../winix/winixd/models/item.h ../../../../morm/src/model.h
edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
edb.o: ../../../../morm/src/flatconnector.h
edb.o: ../../../../morm/src/dbexpression.h
edb.o: ../../../../morm/src/baseexpression.h
edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/modelenv.h
edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
edb.o: ../../../../morm/src/finderhelper.h
edb.o: ../../../../morm/src/fieldvaluehelper.h
edb.o: ../../../../morm/src/flatexpression.h
edb.o: ../../../../winix/winixd/models/itemcontent.h
edb.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
edb.o: ../../../../winix/winixd/db/dbitemquery.h
edb.o: ../../../../winix/winixd/core/item.h
edb.o: ../../../../winix/winixd/db/dbitemcolumns.h
edb.o: ../../../../winix/winixd/core/user.h
edb.o: ../../../../winix/winixd/core/group.h
@@ -56,17 +66,8 @@ edb.o: ../../../../winix/winixd/core/winixmodel.h
edb.o: ../../../../winix/winixd/core/plugin.h
edb.o: ../../../../winix/winixd/core/pluginmsg.h
edb.o: ../../../../winix/winixd/core/plugindata.h ../../../../morm/src/morm.h
edb.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
edb.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
edb.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
edb.o: ../../../../morm/src/flatconnector.h
edb.o: ../../../../morm/src/dbexpression.h
edb.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
edb.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
edb.o: ../../../../morm/src/finderhelper.h
edb.o: ../../../../morm/src/fieldvaluehelper.h
edb.o: ../../../../morm/src/flatexpression.h ../../../../morm/src/finder.h
edb.o: ../../../../morm/src/cursor.h ../../../../morm/src/jsonexpression.h
edb.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
edb.o: ../../../../morm/src/jsonexpression.h
edb.o: ../../../../morm/src/postgresqlexpression.h
edb.o: ../../../../morm/src/jsonconnector.h
edb.o: ../../../../morm/src/postgresqlconnector.h
@@ -99,13 +100,13 @@ exportinfo.o: ../../../../winix/winixd/core/plugin.h
exportinfo.o: ../../../../winix/winixd/core/pluginmsg.h
exportinfo.o: ../../../../winix/winixd/core/plugindata.h
exportinfo.o: ../../../../winix/winixd/core/winixbase.h
exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
exportinfo.o: ../../../../morm/src/model.h
exportinfo.o: ../../../../morm/src/modelconnector.h
exportinfo.o: ../../../../morm/src/clearer.h
exportinfo.o: ../../../../morm/src/dbconnector.h
exportinfo.o: ../../../../morm/src/queryresult.h
exportinfo.o: ../../../../morm/src/flatconnector.h
exportinfo.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
exportinfo.o: ../../../../morm/src/model.h
exportinfo.o: ../../../../morm/src/dbexpression.h
exportinfo.o: ../../../../morm/src/baseexpression.h
exportinfo.o: ../../../../morm/src/modelenv.h
@@ -122,12 +123,12 @@ exportinfo.o: ../../../../morm/src/jsonconnector.h
exportinfo.o: ../../../../morm/src/postgresqlconnector.h
exportinfo.o: ../../../../morm/src/postgresqlqueryresult.h
exportinfo.o: ../../../../winix/winixd/core/dirs.h
exportinfo.o: ../../../../winix/winixd/core/item.h
exportinfo.o: ../../../../winix/winixd/core/dircontainer.h
exportinfo.o: ../../../../winix/winixd/models/item.h
exportinfo.o: ../../../../winix/winixd/models/itemcontent.h
exportinfo.o: ../../../../winix/winixd/db/db.h
exportinfo.o: ../../../../winix/winixd/db/dbbase.h
exportinfo.o: ../../../../winix/winixd/db/dbitemquery.h
exportinfo.o: ../../../../winix/winixd/core/item.h
exportinfo.o: ../../../../winix/winixd/db/dbitemcolumns.h
exportinfo.o: ../../../../winix/winixd/core/user.h
exportinfo.o: ../../../../winix/winixd/core/group.h
@@ -175,9 +176,10 @@ exportinfo.o: ../../../../winix/winixd/templates/patterns.h
exportinfo.o: ../../../../winix/winixd/templates/locale.h
exportinfo.o: ../../../../winix/winixd/templates/localefilter.h
exportinfo.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
exportinfo.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
exportinfo.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
exportinfo.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
exportinfo.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
exportinfo.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
exportinfo.o: ../../../../ezc/src/pattern.h
exportinfo.o: ../../../../ezc/src/expressionparser.h
exportinfo.o: ../../../../ezc/src/patternparser.h
exportinfo.o: ../../../../winix/winixd/notify/notifythread.h
@@ -196,13 +198,12 @@ exportinfo.o: ../../../../pikotools/convert/text.h
exportthread.o: exportthread.h ../../../../winix/winixd/core/basethread.h
exportthread.o: message.h ../../../../winix/winixd/core/log.h
exportthread.o: ../../../../winix/winixd/core/misc.h
exportthread.o: ../../../../winix/winixd/core/item.h
exportthread.o: ../../../../winix/winixd/core/requesttypes.h
exportthread.o: ../../../../pikotools/textstream/textstream.h
exportthread.o: ../../../../pikotools/space/space.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/date/date.h
exportthread.o: ../../../../pikotools/convert/inttostr.h
exportthread.o: ../../../../winix/winixd/core/requesttypes.h
exportthread.o: ../../../../pikotools/textstream/textstream.h
exportthread.o: ../../../../pikotools/membuffer/membuffer.h
exportthread.o: ../../../../pikotools/textstream/types.h
exportthread.o: ../../../../pikotools/utf8/utf8.h
@@ -215,7 +216,6 @@ exportthread.o: ../../../../pikotools/convert/text.h
exportthread.o: ../../../../winix/winixd/core/misc.h
exportthread.o: ../../../../pikotools/convert/text.h
funexport.o: funexport.h ../../../../winix/winixd/functions/functionbase.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/db/db.h
funexport.o: ../../../../winix/winixd/db/dbbase.h
funexport.o: ../../../../winix/winixd/db/dbitemquery.h
@@ -234,7 +234,24 @@ funexport.o: ../../../../winix/winixd/core/requesttypes.h
funexport.o: ../../../../pikotools/textstream/textstream.h
funexport.o: ../../../../pikotools/membuffer/membuffer.h
funexport.o: ../../../../pikotools/textstream/types.h
funexport.o: ../../../../winix/winixd/core/item.h
funexport.o: ../../../../winix/winixd/models/item.h
funexport.o: ../../../../morm/src/model.h
funexport.o: ../../../../morm/src/modelconnector.h
funexport.o: ../../../../morm/src/clearer.h
funexport.o: ../../../../morm/src/dbconnector.h
funexport.o: ../../../../pikotools/log/log.h
funexport.o: ../../../../pikotools/log/filelog.h
funexport.o: ../../../../morm/src/queryresult.h
funexport.o: ../../../../morm/src/flatconnector.h
funexport.o: ../../../../morm/src/dbexpression.h
funexport.o: ../../../../morm/src/baseexpression.h
funexport.o: ../../../../morm/src/morm_types.h
funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funexport.o: ../../../../morm/src/cursorhelper.h
funexport.o: ../../../../morm/src/finderhelper.h
funexport.o: ../../../../morm/src/fieldvaluehelper.h
funexport.o: ../../../../morm/src/flatexpression.h
funexport.o: ../../../../winix/winixd/models/itemcontent.h
funexport.o: ../../../../winix/winixd/core/error.h
funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../winix/winixd/core/textstream.h
@@ -255,8 +272,6 @@ funexport.o: ../../../../winix/winixd/core/config.h
funexport.o: ../../../../pikotools/space/spaceparser.h
funexport.o: ../../../../winix/winixd/core/log.h
funexport.o: ../../../../winix/winixd/core/logmanipulators.h
funexport.o: ../../../../pikotools/log/log.h
funexport.o: ../../../../pikotools/log/filelog.h
funexport.o: ../../../../winix/winixd/core/system.h
funexport.o: ../../../../winix/winixd/core/job.h
funexport.o: ../../../../winix/winixd/core/basethread.h
@@ -270,21 +285,8 @@ funexport.o: ../../../../winix/winixd/core/lock.h
funexport.o: ../../../../winix/winixd/core/plugin.h
funexport.o: ../../../../winix/winixd/core/pluginmsg.h
funexport.o: ../../../../winix/winixd/core/plugindata.h
funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/morm_types.h
funexport.o: ../../../../morm/src/model.h
funexport.o: ../../../../morm/src/modelconnector.h
funexport.o: ../../../../morm/src/clearer.h
funexport.o: ../../../../morm/src/dbconnector.h
funexport.o: ../../../../morm/src/queryresult.h
funexport.o: ../../../../morm/src/flatconnector.h
funexport.o: ../../../../morm/src/dbexpression.h
funexport.o: ../../../../morm/src/baseexpression.h
funexport.o: ../../../../morm/src/modelenv.h ../../../../morm/src/modeldata.h
funexport.o: ../../../../morm/src/cursorhelper.h
funexport.o: ../../../../morm/src/finderhelper.h
funexport.o: ../../../../morm/src/fieldvaluehelper.h
funexport.o: ../../../../morm/src/flatexpression.h
funexport.o: ../../../../morm/src/finder.h ../../../../morm/src/cursor.h
funexport.o: ../../../../morm/src/morm.h ../../../../morm/src/finder.h
funexport.o: ../../../../morm/src/cursor.h
funexport.o: ../../../../morm/src/jsonexpression.h
funexport.o: ../../../../morm/src/postgresqlexpression.h
funexport.o: ../../../../morm/src/jsonconnector.h
@@ -319,9 +321,10 @@ funexport.o: ../../../../winix/winixd/templates/patterns.h
funexport.o: ../../../../winix/winixd/templates/locale.h
funexport.o: ../../../../winix/winixd/templates/localefilter.h
funexport.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
funexport.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
funexport.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
funexport.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
funexport.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
funexport.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
funexport.o: ../../../../ezc/src/pattern.h
funexport.o: ../../../../ezc/src/expressionparser.h
funexport.o: ../../../../ezc/src/patternparser.h
funexport.o: ../../../../winix/winixd/notify/notifythread.h
@@ -350,7 +353,19 @@ init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/plugin.h
init.o: ../../../../winix/winixd/core/pluginmsg.h
init.o: ../../../../winix/winixd/core/plugindata.h
init.o: ../../../../winix/winixd/core/winixbase.h exportthread.h
init.o: ../../../../winix/winixd/core/winixbase.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../morm/src/dbconnector.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/log.h ../../../../pikotools/log/filelog.h
init.o: ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h exportthread.h
init.o: ../../../../winix/winixd/core/basethread.h message.h exportinfo.h
init.o: ../../../../winix/winixd/core/system.h
init.o: ../../../../winix/winixd/core/job.h
@@ -363,23 +378,11 @@ init.o: ../../../../pikotools/space/spaceparser.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../winix/winixd/core/log.h
init.o: ../../../../winix/winixd/core/logmanipulators.h
init.o: ../../../../pikotools/log/log.h
init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../pikotools/log/filelog.h
init.o: ../../../../winix/winixd/core/synchro.h
init.o: ../../../../winix/winixd/core/filelog.h
init.o: ../../../../winix/winixd/core/lock.h
init.o: ../../../../winix/winixd/core/plugin.h ../../../../morm/src/morm.h
init.o: ../../../../morm/src/morm_types.h ../../../../morm/src/model.h
init.o: ../../../../morm/src/modelconnector.h ../../../../morm/src/clearer.h
init.o: ../../../../morm/src/dbconnector.h ../../../../morm/src/queryresult.h
init.o: ../../../../morm/src/flatconnector.h
init.o: ../../../../morm/src/dbexpression.h
init.o: ../../../../morm/src/baseexpression.h ../../../../morm/src/modelenv.h
init.o: ../../../../morm/src/modeldata.h ../../../../morm/src/cursorhelper.h
@@ -393,11 +396,11 @@ init.o: ../../../../morm/src/jsonconnector.h
init.o: ../../../../morm/src/postgresqlconnector.h
init.o: ../../../../morm/src/postgresqlqueryresult.h
init.o: ../../../../winix/winixd/core/dirs.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/dircontainer.h
init.o: ../../../../winix/winixd/models/item.h
init.o: ../../../../winix/winixd/models/itemcontent.h
init.o: ../../../../winix/winixd/db/db.h ../../../../winix/winixd/db/dbbase.h
init.o: ../../../../winix/winixd/db/dbitemquery.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/db/dbitemcolumns.h
init.o: ../../../../winix/winixd/core/user.h
init.o: ../../../../winix/winixd/core/group.h
@@ -445,10 +448,10 @@ init.o: ../../../../winix/winixd/templates/patterns.h
init.o: ../../../../winix/winixd/templates/locale.h
init.o: ../../../../winix/winixd/templates/localefilter.h
init.o: ../../../../ezc/src/ezc.h ../../../../ezc/src/generator.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/cache.h
init.o: ../../../../ezc/src/functions.h ../../../../ezc/src/funinfo.h
init.o: ../../../../ezc/src/objects.h ../../../../ezc/src/pattern.h
init.o: ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/blocks.h ../../../../ezc/src/item.h
init.o: ../../../../ezc/src/cache.h ../../../../ezc/src/functions.h
init.o: ../../../../ezc/src/funinfo.h ../../../../ezc/src/objects.h
init.o: ../../../../ezc/src/pattern.h ../../../../ezc/src/expressionparser.h
init.o: ../../../../ezc/src/patternparser.h
init.o: ../../../../winix/winixd/notify/notifythread.h
init.o: ../../../../winix/winixd/notify/templatesnotify.h

39
winixd/plugins/export/exportinfo.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2018, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -188,7 +188,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_
system->dirs.MakePath(item.parent_id, msg.path);
msg.path += item.url;
if( item.file_type != WINIX_ITEM_FILETYPE_NONE )
if( item.item_content.file_type != WINIX_ITEM_FILETYPE_NONE )
{
msg.type = WINIX_PL_EXPORT_TYPE_CREATE_FILE_STATIC;
@@ -220,7 +220,7 @@ void ExportInfo::SendFile(const Item & item, bool thumb, bool put_to_recurrence_
msg.http_server = exp.http_server;
system->dirs.MakePath(exp_dir->dir_id, msg.src_dir);
if( !item.file_path.empty() && thumb ) // !! uzyc file_type
if( !item.item_content.file_path.empty() && thumb ) // !! uzyc file_type
msg.path.insert(0, L"/download"); // !! do konfiga
if( !exp.ftp_dir.empty() )
@@ -299,15 +299,26 @@ void ExportInfo::SendDir(long dir_id)
// send all non-static files from a directory
void ExportInfo::SendAllFilesFromDir(long dir_id)
{
iq_dir.SetAll(false, false);
iq_dir.sel_parent_id = true;
iq_dir.sel_url = true;
iq_dir.sel_file = true;
iq_dir.WhereParentId(dir_id);
iq_dir.WhereType(Item::file);
iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
// iq_dir.SetAll(false, false);
// iq_dir.sel_parent_id = true;
// iq_dir.sel_url = true;
// iq_dir.sel_file = true;
// iq_dir.WhereParentId(dir_id);
// iq_dir.WhereType(Item::file);
// iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
db->GetItems(dir_items, iq_dir);
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir_id).
eq(L"type", static_cast<int>(Item::file)).
eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE).
get_vector(dir_items);
//db->GetItems(dir_items, iq_dir);
for(size_t i=0 ; i<dir_items.size() ; ++i)
{
@@ -319,10 +330,10 @@ void ExportInfo::SendAllFilesFromDir(long dir_id)
void ExportInfo::AdditionalExport(const Item & item)
{
for(size_t i=0 ; i<item.meta.spaces.size() ; ++i)
for(size_t i=0 ; i<item.item_content.meta.spaces.size() ; ++i)
{
if( item.meta.spaces[i]->name == L"export" )
AdditionalExport(item, *item.meta.spaces[i]);
if( item.item_content.meta.spaces[i]->name == L"export" )
AdditionalExport(item, *item.item_content.meta.spaces[i]);
}
}

8
winixd/plugins/export/exportinfo.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
#include "edb.h"
#include "message.h"
#include "exportthread.h"
#include "core/winixbase.h"
#include "core/winixmodel.h"
@@ -52,7 +52,7 @@ namespace Export
{
class ExportInfo : public WinixBase
class ExportInfo : public WinixModel
{
public:
@@ -93,7 +93,7 @@ private:
Export exp;
std::wstring tmp_dir;
std::vector<ExportDir> export_dirs;
DbItemQuery iq_dir;
//DbItemQuery iq_dir;
std::vector<Item> dir_items;
std::vector<std::wstring> additional_export;
std::vector<Item*> additional_export_dir_tab;

35
winixd/plugins/export/funexport.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,7 +68,7 @@ void FunExport::ExportFile(const Item & item)
{
log << log4 << "Export: exporting file: url: " << item.url << ", id: " << item.id << logend;
if( item.file_type == WINIX_ITEM_FILETYPE_NONE )
if( item.item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info->SendFile(item, false, true);
}
@@ -86,25 +86,36 @@ void FunExport::ExportDir(const Item & dir, bool static_files_too)
log << log4 << "Export: exporting directory: url: " << dir.url << ", id: " << dir.id << logend;
iq_dir.SetAll(false, false);
iq_dir.sel_parent_id = true;
iq_dir.sel_url = true;
iq_dir.sel_file = true;
iq_dir.WhereParentId(dir.id);
iq_dir.WhereType(Item::file);
// iq_dir.SetAll(false, false);
// iq_dir.sel_parent_id = true;
// iq_dir.sel_url = true;
// iq_dir.sel_file = true;
// iq_dir.WhereParentId(dir.id);
// iq_dir.WhereType(Item::file);
morm::Finder<Item> finder(model_connector);
finder.
select().
where().
eq(L"parent_id", dir.id).
eq(L"type", static_cast<int>(Item::file));
if( !static_files_too )
iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
{
//iq_dir.WhereFileType(WINIX_ITEM_FILETYPE_NONE);
finder.eq(L"content.file_type", WINIX_ITEM_FILETYPE_NONE);
}
db->GetItems(dir_items, iq_dir);
finder.get_vector(dir_items);
//db->GetItems(dir_items, iq_dir);
for(size_t i=0 ; i<dir_items.size() ; ++i)
{
ExportFile(dir_items[i]);
}
DirContainer::ParentIterator i = system->dirs.FindFirstChild(dir.id);
for( ; i != system->dirs.ParentEnd() ; i = system->dirs.NextChild(i) )

4
winixd/plugins/export/funexport.h
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2012-2014, Tomasz Sowa
* Copyright (c) 2012-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -66,7 +66,7 @@ public:
private:
ExportInfo * export_info;
DbItemQuery iq_dir;
//DbItemQuery iq_dir;
std::vector<Item> dir_items;
void Export();

14
winixd/plugins/export/init.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2018, Tomasz Sowa
* Copyright (c) 2011-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -113,7 +113,7 @@ void SendFileAdded(PluginInfo & info)
if( item )
{
if( item->file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_IMAGE && info.config->image_resize )
{
// there'll be a next message WINIX_IMAGE_RESIZED
info.log << log4 << "Export: image will be resized, waiting..." << logend;
@@ -124,7 +124,7 @@ void SendFileAdded(PluginInfo & info)
export_info.SendFile(*item);
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}
@@ -141,7 +141,7 @@ void SendFileChanged(PluginInfo & info)
export_info.SendFile(*item);
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}
@@ -157,7 +157,7 @@ void SendFileCopied(PluginInfo & info)
export_info.ResetRecurrenceCheck();
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info.SendAllFilesFromDir(item->parent_id);
}
@@ -203,7 +203,7 @@ void SendFilePrepareMove(PluginInfo & info)
if( item )
{
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
{
export_info.ResetRecurrenceCheck();
export_info.SendAllFilesFromDir(item->parent_id);
@@ -221,7 +221,7 @@ void FileRemoved(PluginInfo & info)
export_info.ResetRecurrenceCheck();
export_info.SendDir(item->parent_id);
if( item->file_type == WINIX_ITEM_FILETYPE_NONE )
if( item->item_content.file_type == WINIX_ITEM_FILETYPE_NONE )
export_info.SendAllFilesFromDir(item->parent_id);
}
}