anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#7 logic for simpe mp3 + xml uploads is nearly complete (database objects are not yet produced and code is not tested yet)

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2020-09-11 17:05:17 +04:30
parent 675f0393e5
commit 94ea1ba33b
2 changed files with 68 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
RMuseum/Services/Implementation/AudioNarrationService.cs
View File

@ -271,12 +271,67 @@ namespace RMuseum.Services.Implementation
} }
} }
UserNarrationProfile defProfile = await context.UserNarrationProfiles.Where(p => p.UserId == session.UseId && p.IsDefault == true).FirstOrDefaultAsync();
if (defProfile == null)
{
defProfile = new UserNarrationProfile()
{
FileSuffixWithoutDash = !string.IsNullOrEmpty(session.User.FirstName) ? !string.IsNullOrEmpty(session.User.SureName) ?
GPersianTextSync.Farglisize($"{session.User.FirstName[0]}{session.User.SureName[0]}")
:
GPersianTextSync.Farglisize($"{session.User.FirstName[0]}") : $"{session.User.UserName[0]}",
ArtistName = $"{session.User.FirstName} {session.User.SureName}",
ArtistUrl = "",
AudioSrc = "",
AudioSrcUrl = ""
};
}
foreach (UploadSessionFile file in session.UploadedFiles.Where(file => Path.GetExtension(file.FilePath) == ".xml").ToList()) foreach (UploadSessionFile file in session.UploadedFiles.Where(file => Path.GetExtension(file.FilePath) == ".xml").ToList())
{ {
try try
{ {
foreach (PoemAudio audio in PoemAudioListProcessor.Load(file.FilePath)) //although each xml can theorically contain more than one file information
//this assumption was never implemented and used in Desktop Ganjoor which produces this xml file
//within the loop code the file is moved somewhere else and if the loop reaches is unexpected second path
//the code would fail!
foreach (PoemAudio audio in PoemAudioListProcessor.Load(file.FilePath))
{ {
string soundFilesFolder = Configuration.GetSection("AudioUploadService")["StoragePath"];
string targetPathForAudioFiles = Path.Combine(Configuration.GetSection("LocalAudioRepositoryPath")["StoragePath"], Configuration.GetSection("AudioUploadService")["StoragePath"]);
if (!Directory.Exists(targetPathForAudioFiles))
{
Directory.CreateDirectory(targetPathForAudioFiles);
}
string targetPathForXmlFiles = Path.Combine(targetPathForAudioFiles, "x");
if (!Directory.Exists(targetPathForXmlFiles))
{
Directory.CreateDirectory(targetPathForXmlFiles);
}
string fileNameWithoutExtension = $"{audio.PoemId}-{defProfile.FileSuffixWithoutDash}";
int tmp = 1;
while
(
File.Exists(Path.Combine(targetPathForAudioFiles, $"{fileNameWithoutExtension}.mp3"))
||
File.Exists(Path.Combine(targetPathForAudioFiles, $"{fileNameWithoutExtension}.ogg"))
||
File.Exists(Path.Combine(targetPathForXmlFiles, $"{fileNameWithoutExtension}.xml"))
)
{
fileNameWithoutExtension = $"{audio.PoemId}-{defProfile.FileSuffixWithoutDash}{tmp}";
tmp++;
}
string localXmlFilePath = Path.Combine(targetPathForXmlFiles, $"{fileNameWithoutExtension}.xml");
File.Move(file.FilePath, localXmlFilePath); //this is the movemnet I talked about earlier
string localMp3FilePath = Path.Combine(targetPathForAudioFiles, $"{fileNameWithoutExtension}.mp3");
UploadSessionFile mp3file = mp3files.Where(mp3 => mp3.MP3FileCheckSum == audio.FileCheckSum).SingleOrDefault(); UploadSessionFile mp3file = mp3files.Where(mp3 => mp3.MP3FileCheckSum == audio.FileCheckSum).SingleOrDefault();
if(mp3file == null) if(mp3file == null)
{ {
@ -285,8 +340,10 @@ namespace RMuseum.Services.Implementation
} }
else else
{ {
File.Move(mp3file.FilePath, localMp3FilePath);
//here we should produce and save ogg file //here we should produce and save ogg file
byte[] mp3bytes = File.ReadAllBytes(mp3file.FilePath); byte[] mp3bytes = File.ReadAllBytes(Path.Combine(targetPathForAudioFiles, $"{fileNameWithoutExtension}.mp3"));
int mp3fileSize = mp3bytes.Length; int mp3fileSize = mp3bytes.Length;
int oggfileSize; int oggfileSize;
using (MemoryStream ms = new MemoryStream(mp3bytes)) using (MemoryStream ms = new MemoryStream(mp3bytes))
@ -296,46 +353,27 @@ namespace RMuseum.Services.Implementation
await mp3FileReader.ReadAsync(samples, 0, (int)mp3FileReader.Length); await mp3FileReader.ReadAsync(samples, 0, (int)mp3FileReader.Length);
var oggBytes = ConvertRawPCMFile(mp3FileReader.Mp3WaveFormat.SampleRate, mp3FileReader.Mp3WaveFormat.Channels, samples, PCMSample.EightBit, mp3FileReader.Mp3WaveFormat.SampleRate, mp3FileReader.Mp3WaveFormat.Channels); var oggBytes = ConvertRawPCMFile(mp3FileReader.Mp3WaveFormat.SampleRate, mp3FileReader.Mp3WaveFormat.Channels, samples, PCMSample.EightBit, mp3FileReader.Mp3WaveFormat.SampleRate, mp3FileReader.Mp3WaveFormat.Channels);
oggfileSize = oggBytes.Length; oggfileSize = oggBytes.Length;
File.WriteAllBytes(Path.Combine(Path.GetDirectoryName(mp3file.FilePath), $"{Path.GetFileNameWithoutExtension(mp3file.FilePath)}.ogg") , oggBytes); File.WriteAllBytes(Path.Combine(targetPathForAudioFiles, $"{fileNameWithoutExtension}.ogg"), oggBytes);
} }
UserNarrationProfile defProfile = await context.UserNarrationProfiles.Where(p => p.UserId == session.UseId && p.IsDefault == true).FirstOrDefaultAsync();
if(defProfile == null)
{
defProfile = new UserNarrationProfile()
{
FileSuffixWithoutDash = !string.IsNullOrEmpty(session.User.FirstName) ? !string.IsNullOrEmpty(session.User.SureName) ?
GPersianTextSync.Farglisize($"{session.User.FirstName[0]}{session.User.SureName[0]}")
:
GPersianTextSync.Farglisize($"{session.User.FirstName[0]}") : $"{session.User.UserName[0]}",
ArtistName = $"{session.User.FirstName} {session.User.SureName}",
ArtistUrl = "",
AudioSrc = "",
AudioSrcUrl = ""
};
}
//create draft poem narration:
string FileNameWithoutExtension = $"{audio.PoemId}-{defProfile.FileSuffixWithoutDash}";
Guid legacyAudioGuid = audio.SyncGuid; Guid legacyAudioGuid = audio.SyncGuid;
while( while(
(await context.AudioFiles.Where(a => a.LegacyAudioGuid == legacyAudioGuid).FirstOrDefaultAsync()) != null (await context.AudioFiles.Where(a => a.LegacyAudioGuid == legacyAudioGuid).FirstOrDefaultAsync()) != null
) )
{ legacyAudioGuid = Guid.NewGuid(); } {
legacyAudioGuid = Guid.NewGuid();
}
//TODO: rename and move files somewhere here
PoemNarration narration = new PoemNarration() PoemNarration narration = new PoemNarration()
{ {
OwnerId = session.UseId, OwnerId = session.UseId,
GanjoorAudioId = 1 + await context.AudioFiles.OrderByDescending(a => a.GanjoorAudioId).Select(a => a.GanjoorAudioId).FirstOrDefaultAsync(), GanjoorAudioId = 1 + await context.AudioFiles.OrderByDescending(a => a.GanjoorAudioId).Select(a => a.GanjoorAudioId).FirstOrDefaultAsync(),
AudioOrder = 1 + await context.AudioFiles.Where(a => a.GanjoorPostId == audio.PoemId).OrderByDescending(a => a.GanjoorAudioId).Select(a => a.GanjoorAudioId).FirstOrDefaultAsync(), AudioOrder = 1 + await context.AudioFiles.Where(a => a.GanjoorPostId == audio.PoemId).OrderByDescending(a => a.GanjoorAudioId).Select(a => a.GanjoorAudioId).FirstOrDefaultAsync(),
FileNameWithoutExtension = FileNameWithoutExtension, FileNameWithoutExtension = fileNameWithoutExtension,
SoundFilesFolder = "a2", SoundFilesFolder = soundFilesFolder,
AudioTitle = audio.PoemTitle, AudioTitle = audio.PoemTitle,
AudioArtist = defProfile.ArtistName, AudioArtist = defProfile.ArtistName,
AudioArtistUrl = defProfile.ArtistUrl, AudioArtistUrl = defProfile.ArtistUrl,
@ -346,8 +384,8 @@ namespace RMuseum.Services.Implementation
Mp3SizeInBytes = mp3fileSize, Mp3SizeInBytes = mp3fileSize,
OggSizeInBytes = oggfileSize, OggSizeInBytes = oggfileSize,
UploadDate = session.UploadEndTime, UploadDate = session.UploadEndTime,
LocalMp3FilePath = mp3file.FilePath, LocalMp3FilePath = localMp3FilePath,
LocalXmlFilePath = file.FilePath, LocalXmlFilePath = localXmlFilePath,
AudioSyncStatus = (int)AudioSyncStatus.NewItem, AudioSyncStatus = (int)AudioSyncStatus.NewItem,
ReviewStatus = AudioReviewStatus.Draft ReviewStatus = AudioReviewStatus.Draft
}; };

1
RMuseum/appsettings.json
View File

@ -42,6 +42,7 @@
"AudioUploadService": { "AudioUploadService": {
"StoragePath": "C:\\audio", "StoragePath": "C:\\audio",
"LocalAudioRepositoryPath": "D:\\My Documents\\My Web Design\\ganjoor\\www\\i", "LocalAudioRepositoryPath": "D:\\My Documents\\My Web Design\\ganjoor\\www\\i",
"CurrentSoundFilesFolder": "a2"
}, },
"AllowedHosts": "*" "AllowedHosts": "*"
} }