diff --git a/RMuseum/Models/GanjoorAudio/AudioReviewStatus.cs b/RMuseum/Models/GanjoorAudio/AudioReviewStatus.cs new file mode 100644 index 00000000..16d730da --- /dev/null +++ b/RMuseum/Models/GanjoorAudio/AudioReviewStatus.cs @@ -0,0 +1,23 @@ +namespace RMuseum.Models.GanjoorAudio +{ + /// + /// Audio Review Status + /// + public enum AudioReviewStatus + { + /// + /// pending for review + /// + Pending = 0, + + /// + /// approved + /// + Approved = 1, + + /// + /// Rejected + /// + Rejected = 2 + } +} diff --git a/RMuseum/Models/GanjoorAudio/AudioSyncStatus.cs b/RMuseum/Models/GanjoorAudio/AudioSyncStatus.cs index c03c33ca..6dcc29b0 100644 --- a/RMuseum/Models/GanjoorAudio/AudioSyncStatus.cs +++ b/RMuseum/Models/GanjoorAudio/AudioSyncStatus.cs @@ -8,7 +8,7 @@ /// /// no changed /// - Synchronized = 0, + SynchronizedOrRejected = 0, /// /// new upload diff --git a/RMuseum/Models/GanjoorAudio/PoemNarration.cs b/RMuseum/Models/GanjoorAudio/PoemNarration.cs index fa074e5d..788400b7 100644 --- a/RMuseum/Models/GanjoorAudio/PoemNarration.cs +++ b/RMuseum/Models/GanjoorAudio/PoemNarration.cs @@ -24,6 +24,11 @@ namespace RMuseum.Models.GanjoorAudio /// public Guid OwnerId { get; set; } + /// + /// Final data is actually exported to a MySQL database which this auto increment field is its key + /// + public int GanjoorAudioId { get; set; } + /// /// Ganjoor Post Id /// @@ -34,11 +39,6 @@ namespace RMuseum.Models.GanjoorAudio /// public int AudioOrder { get; set; } - /// - /// Final data is actually exported to a MySQL database which this auto increment field is its key - /// - public int GanjoorAudioId { get; set; } - /// /// Using this field content you would determine xml, mp3 and ogg file names /// @@ -58,7 +58,7 @@ namespace RMuseum.Models.GanjoorAudio /// /// MP3 File Path /// - public string Mp3FilePath { get { return $"/i/{SoundFilesFolder}/{FileNameWithoutExtension}.mp3"; } } + public string RemoteMp3FilePath { get { return $"/i/{SoundFilesFolder}/{FileNameWithoutExtension}.mp3"; } } /// /// MP3 url @@ -69,7 +69,7 @@ namespace RMuseum.Models.GanjoorAudio /// /// OGG File Path /// - public string OggFilePath { get { return $"/i/{SoundFilesFolder}/{FileNameWithoutExtension}.ogg"; } } + public string RemoteOggFilePath { get { return $"/i/{SoundFilesFolder}/{FileNameWithoutExtension}.ogg"; } } /// /// OGG url @@ -82,7 +82,7 @@ namespace RMuseum.Models.GanjoorAudio /// /// "/i/a2/x" /// - public string XMLFilePath { get { return $"/i/{SoundFilesFolder}/x/{FileNameWithoutExtension}.xml"; } } + public string RemoteXMLFilePath { get { return $"/i/{SoundFilesFolder}/x/{FileNameWithoutExtension}.xml"; } } /// /// Audio Title @@ -130,23 +130,35 @@ namespace RMuseum.Models.GanjoorAudio public int OggSizeInBytes { get; set; } /// - /// Audio Date + /// Upload Date /// public DateTime UploadDate { get; set; } /// - /// MP3 File temporary pass on Windows Server + /// Review Date (Approve or Reject) /// - public string TemporaryUploadedMp3FilePath { get; set; } + public DateTime ReviewDate{ get; set; } /// - /// XML File temporary pass on Windows Server + /// MP3 File local path on Windows Server (if item is not rejected probably it is not valid and it is deleted) /// - public string TemporaryUploadedXmlFilePath { get; set; } + public string LocalMp3FilePath { get; set; } + + /// + /// XML File local path on Windows Server (if item is not rejected probably it is not valid and it is deleted) + /// + public string LocalXmlFilePath { get; set; } /// /// Value is one or a combination of /// public int AudioSyncStatus { get; set; } + + /// + /// Review Status + /// + public AudioReviewStatus ReviewStatus { get; set; } + + } } diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index b2f7c194..85cf51b4 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -1495,12 +1495,32 @@ User Note + + + Audio Review Status + + + + + pending for review + + + + + approved + + + + + Rejected + + Audio Synchronization Status (binary combination is acceptable) - + no changed @@ -1550,6 +1570,11 @@ Owner User Id + + + Final data is actually exported to a MySQL database which this auto increment field is its key + + Ganjoor Post Id @@ -1560,11 +1585,6 @@ This determines where an audio is displayed between a list of sounds related to a specfic poem - - - Final data is actually exported to a MySQL database which this auto increment field is its key - - Using this field content you would determine xml, mp3 and ogg file names @@ -1581,7 +1601,7 @@ We had previously used different pathes because when a directory became overcrowded our connection time would increase unbearably due to IRAN internet problems, so it is sensible to store it per record and not as a global option value - + MP3 File Path @@ -1591,7 +1611,7 @@ MP3 url - + OGG File Path @@ -1601,7 +1621,7 @@ OGG url - + This is also a legacy field @@ -1656,17 +1676,22 @@ - Audio Date + Upload Date - + - MP3 File temporary pass on Windows Server + Review Date (Approve or Reject) - + - XML File temporary pass on Windows Server + MP3 File local path on Windows Server (if item is not rejected probably it is not valid and it is deleted) + + + + + XML File local path on Windows Server (if item is not rejected probably it is not valid and it is deleted) @@ -1674,6 +1699,11 @@ Value is one or a combination of + + + Review Status + + ganjoor link for artifacts and items