Skip to content
Snippets Groups Projects

Playlist rc6

Closed Alexandre Fernandez requested to merge Nerf/medialibrary:playlist-rc6 into master

Should correct all points raised in RC5

Merge request reports

Checking pipeline status.

Approval is optional

Closed by Alexandre FernandezAlexandre Fernandez 7 years ago (Nov 23, 2017 10:29am UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
85 103 {
86 LOG_ERROR( "Failed to add media ", task.mrl, " to the media library" );
87 return parser::Task::Status::Fatal;
104 auto t = m_ml->getConn()->newTransaction();
105 LOG_INFO( "Adding ", task.mrl );
106 task.media = Media::create( m_ml, IMedia::Type::Unknown, utils::file::fileName( task.mrl ) );
107 if ( task.media == nullptr )
108 {
109 LOG_ERROR( "Failed to add media ", task.mrl, " to the media library" );
110 return parser::Task::Status::Fatal;
111 }
112 // For now, assume all media are made of a single file
113 task.file = task.media->addFile( *task.fileFs, task.parentFolder->id(),
114 task.parentFolderFs->device()->isRemovable(),
115 File::Type::Main );
116 t->commit();
  • 288 t2->commit();
    289 return;
    290 }
    291 bool isDirectory;
    292 try
    293 {
    294 isDirectory = utils::fs::isDirectory( utils::file::toLocalPath( mrl ) );
    295 }
    296 catch ( std::system_error& ex )
    297 {
    298 LOG_ERROR( ex.what() );
    299 return;
    300 }
    301 LOG_INFO( "Importing ", isDirectory ? "folder " : "file ", mrl, " in the playlist ", task.mrl );
    302 auto directoryMrl = utils::file::directory( mrl );
    303 auto parentFolder = Folder::fromMrl( m_ml, directoryMrl );
  • 123 130 return self;
    124 131 }
    125 132
    133 void Folder::excludeEntryFolder( MediaLibraryPtr ml, int64_t folderId )
    134 {
    135 std::string req = "INSERT INTO ExcludedEntryFolder(folder_id) VALUES(?)";
    136 sqlite::Tools::executeRequest( ml->getConn(), req, sqlite::ForeignKey( folderId ) );
  • Please register or sign in to reply
    Loading