bug fix for rename file

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: writernote
-version: 1.2.10
+version: 1.2.11
 
 summary: Writernote
 

src/currenttitle/audiototext.cpp

@@ -1,4 +1,6 @@
-#ifndef AUDIO_TO_TEXT_CPP
-#define AUDIO_TO_TEXT_CPP
+#include "audiototext.h"
+#include "../mainwindow.h"
 
-#endif
+void audiototext(MainWindow *padre, int posizione){
+
+}

src/currenttitle/audiototext.h

@@ -0,0 +1,8 @@
+#ifndef AUDIOTOTEXT_H
+#define AUDIOTOTEXT_H
+
+#include "../mainwindow.h"
+
+void audiototext(MainWindow *padre, int posizione);
+
+#endif // AUDIOTOTEXT_H

src/currenttitle/deletecopybook.cpp

@@ -1,6 +1,8 @@
 #ifndef DELETE_COPY_BOOK_CPP
 #define DELETE_COPY_BOOK_CPP
 
+#include "deletecopybook.h"
+
 #include "../mainwindow.h"
 #include "ui_mainwindow.h"
 #include "../areyousure.h"
@@ -10,10 +12,10 @@
 #include "../update_list_copybook.h"
 
 #include <QMediaPlayer>
-#include "redolist.cpp"
+#include "redolist.h"
 
 /* funzione che gestisce l'eliminizione del copybook */
-void f_deletecopybook( MainWindow *parent, const char *copybook = nullptr){
+void f_deletecopybook( MainWindow *parent, const char *copybook){
     if(!areyousure(parent, "Delete copybook", "are you sure you want to delete " + (QString)copybook + "?"))
         return redolist(parent);
 

src/currenttitle/deletecopybook.h

@@ -0,0 +1,8 @@
+#ifndef DELETECOPYBOOK_H
+#define DELETECOPYBOOK_H
+
+#include "../mainwindow.h"
+
+void f_deletecopybook( MainWindow *parent, const char *copybook = nullptr);
+
+#endif // DELETECOPYBOOK_H

src/currenttitle/redolist.cpp

@@ -1,5 +1,4 @@
-#ifndef REDO_LIST_CPP
-#define REDO_LIST_CPP
+#include "redolist.h"
 
 #include "../mainwindow.h"
 #include "ui_mainwindow.h"
@@ -15,5 +14,3 @@ void redolist(MainWindow *parent)
     int posizione = parent->self->indice.titolo.indexOf(parent->self->currentTitle, 0);
     parent->ui->listWidgetSX->setCurrentRow(posizione);
 }
-
-#endif

src/currenttitle/renamefile.cpp

@@ -1,18 +1,23 @@
-#ifndef CURRENT_TITLE_RENAME_FILE_CPP
-#define CURRENT_TITLE_RENAME_FILE_CPP
+#include "renamefile.h"
 
 #include "../mainwindow.h"
-#include "redolist.cpp"
+#include "redolist.h"
 #include "QInputDialog"
 #include "../dialog_critic.h"
 #include "../datawrite/renamefile_f_zip.h"
 #include "../update_list_copybook.h"
 
+#include "ui_mainwindow.h"
+
+#include "../datawrite/savefile.h"
+
 void renamefile(MainWindow *parent, const char *namefile){
+    bool checkname = (parent->ui->listWidgetSX->currentItem()->text() == parent->self->currentTitle);
+
     bool ok;
     QString namecopybook = QInputDialog::getText(parent, "Rename",
                                                  (QString)"Rename " + parent->ui->listWidgetSX->currentItem()->text(), QLineEdit::Normal,
-                                                 "", &ok);
+                                                 parent->ui->listWidgetSX->currentItem()->text(), &ok);
     if(!ok || namecopybook == "")
         return redolist(parent);
 
@@ -29,7 +34,17 @@ void renamefile(MainWindow *parent, const char *namefile){
 
     parent->self->indice.titolo[posizione] = namecopybook;
 
+    savefile file_(parent, &parent->self->currentTitle);
+
+    if(!file_.savefile_check_indice()){
+        renamefile_f_zip(parent->self->path.c_str(), namecopybook.toUtf8().constData(), namefile);
+        dialog_critic("We had an error saving the index of the file");
+        return update_list_copybook(parent);
+    }
+
+    parent->setWindowTitle("Writernote - " + namecopybook);
+    if(checkname)
+        parent->self->currentTitle = namecopybook;
+
     return update_list_copybook(parent);
 }
-
-#endif //CURRENT_TITLE_RENAME_FILE_CPP

src/currenttitle/renamefile.h

@@ -0,0 +1,8 @@
+#ifndef RENAMEFILE_H
+#define RENAMEFILE_H
+
+#include "../mainwindow.h"
+
+void renamefile(MainWindow *parent, const char *namefile);
+
+#endif // RENAMEFILE_H

src/currenttitle/rightclicklistcopybook.cpp

@@ -1,41 +1,57 @@
-#ifndef RIGHT_CLICK_LIST_COPYBOOK_CPP
-#define RIGHT_CLICK_LIST_COPYBOOK_CPP
-
 #include "../mainwindow.h"
+#include "ui_mainwindow.h"
+
 
 #include <QMenu>
 #include "../dialog_critic.h"
 #include <QInputDialog>
-#include "redolist.cpp"
+#include "redolist.h"
 #include <QString>
 
-#include "deletecopybook.cpp"
+#include <QContextMenuEvent>
+
+#include "deletecopybook.h"
+#include "audiototext.h"
+#include "renamefile.h"
+
+#include "../areyousure.h"
+
 void MainWindow::deletecopybook_f(){
     if(!this->ui->listWidgetSX->currentItem()->isSelected())
         return redolist(this);
 
     f_deletecopybook(this, this->ui->listWidgetSX->currentItem()->text().toUtf8().constData());
 }
 
-#include "compressvideo.cpp"
 void MainWindow::compressvideo_f(){
     if(!this->ui->listWidgetSX->currentItem()->isSelected())
         return redolist(this);
+
+    if(this->ui->listWidgetSX->currentItem()->text() != this->self->currentTitle){
+            if(!areyousure(this, "Warning", "For compress video you need to change the current copybook\nDo you want to continue?"))
+                return;
+
+        this->on_listWidgetSX_itemDoubleClicked(this->ui->listWidgetSX->currentItem());
+    }
+
+    this->on_actioncompress_video_triggered();
 }
 
-#include "renamefile.cpp"
 void MainWindow::renamefile_f(){
     if(!this->ui->listWidgetSX->currentItem()->isSelected())
         return redolist(this);
 
     renamefile(this, this->ui->listWidgetSX->currentItem()->text().toUtf8().constData());
+
 }
 
-#include "audiototext.cpp"
+
 void MainWindow::audiototext_f(){
     messaggio_utente("This option is not implemented in the current version");
-    if(!this->ui->listWidgetSX->currentItem()->isSelected())
+    if(!this->ui->listWidgetSX->currentItem()->isSelected()){
+        messaggio_utente("This version of writernote is not yet capable of translating audio to text");
         return redolist(this);
+    }
 }
 
 #include "deleteaudio.h"
@@ -90,37 +106,4 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event){
     menu.addAction(renamecopybook_action);
     menu.exec(event->globalPos());
 }
-/*
-        action = contextMenu.exec_(self.mapToGlobal(event.pos()))
-        currentItem = self.listwidget.currentItem()
-
-
-        if currentItem is None: return
-
-        if action == self.listwidget.addQuaderno:
-            self.newCopyBook()
-
-        elif action == self.listwidget.deleteQuaderno:
-            self.deleteCopyBookFunction(currentItem=currentItem)
-
-        elif action == self.listwidget.deleteAudio:
-            self.deleteAudio_Function(currentItem=currentItem)
-
-        elif action == self.listwidget.renameCopybook:
-            if not isinstance(currentItem, str): currentItem = currentItem.text()
-            return rename.Rename(parent=self, copybook=currentItem)
-
-        elif action == self.listwidget.comprimiVideo:
-
-            self.compressVideo(currentItem)
-
-        elif action == self.listwidget.convert_textAudio:
-            if self.on_clickMenuList() is True:
-                self.convertAudioToText()
-        else:
-            pass
-
-
-*/
 
-#endif

src/datawrite/renamefile_f_zip.cpp

@@ -5,24 +5,42 @@
 #include "zip.h"
 #include "iostream"
 
+#include "../dialog_critic.h"
+
 bool renamefile_f_zip(const char *namezip, const char *from, const char *dest){
-    int errorp;
+    int errorp = 0;
     zip_t *filezip;
 
-    //filezip = zip_open(namezip, ZIP_SOURCE_WRITE, &errorp);
     filezip = zip_open(namezip, ZIP_CREATE, &errorp);
 
     if(filezip == nullptr)
     {
+        QFile file(namezip);
+        if(file.open(QIODevice::ReadOnly))
+        {
+            dialog_critic("File is only in read mode");
+            return false;
+        }
+        else if(!file.exists()){
+            dialog_critic("File didn't exist");
+            return false;
+        }
+
         zip_error_t ziperror;
         zip_error_init_with_code(&ziperror, errorp);
         throw std::runtime_error("Failed to open output file " + (std::string)from + ": " + zip_error_strerror(&ziperror));
     }
 
     /* ZIP_FL_ENC_UTF_8 */
+    int indice = zip_name_locate(filezip, ((QString)from + ".xml").toUtf8().constData(), ZIP_FL_ENC_STRICT);
+
+    if(indice == -1)
+    {
+        dialog_critic("The file didn't exist in the zip");
+        return false;
+    }
 
-    int indice = zip_name_locate(filezip, from, 0);
-    if(zip_file_rename(filezip, indice, dest, ZIP_FL_ENC_UTF_8) == -1){
+    if(zip_file_rename(filezip, indice, ((QString)dest + ".xml").toUtf8().constData(), 0) == -1){
         zip_error_t ziperror;
         zip_error_init_with_code(&ziperror, errorp);
 

src/datawrite/savefile.cpp

@@ -27,11 +27,10 @@ bool savefile::compressfile(const char *namefile, const char *text){
     namefile: nome file da salvare ("indice.xml", "file2.xml")
     text: testo da scrivere
 */
-    int errorp;
+    int errorp = 0;
 
     zip_t *filezip = zip_open(this->parent->self->path.c_str(), ZIP_CREATE , &errorp);
 
-
     if (filezip == nullptr) {
             zip_error_t ziperror;
             zip_error_init_with_code(&ziperror, errorp);

src/mainwindow.cpp

@@ -22,9 +22,6 @@
 #include "indice_class.h"
 #include "self_class.h"
 
-/* gestione copybook */
-#include "currenttitle/main_include_currenttitle.h"
-
 /* gestione della lista */
 #include "currenttitle/redolist.h"
 

src/mainwindow.h

@@ -61,6 +61,8 @@ public slots:
     /* la funzione serve anche per eliminare l'audio del copybook */
     void on_listWidgetSX_itemDoubleClicked(QListWidgetItem *item);
 
+    void on_actioncompress_video_triggered();
+
 private slots:
     /* registrazione dell'audio */
     void setOutputLocation();
@@ -132,7 +134,6 @@ private slots:
 
     void on_actionDelete_audio_triggered();
 
-    void on_actioncompress_video_triggered();
 
     void on_volumeSlider_actionTriggered(int action);
 

src/update_list_copybook.cpp

@@ -0,0 +1,16 @@
+#include "update_list_copybook.h"
+#include "mainwindow.h"
+
+#include "ui_mainwindow.h"
+
+void update_list_copybook(MainWindow *parent){
+    int i;
+
+    /*pulisce la lista*/
+    parent->ui->listWidgetSX->clear();
+
+    int lunghezzalista = parent->self->indice.titolo.length();
+
+    for(i=0 ; i < lunghezzalista; i++)
+        parent->ui->listWidgetSX->addItem(parent->self->indice.titolo[i]);
+}