Merge branch 'master' of https://github.com/iptton/Rythem

Conflicts: Rythem.pro
AlloyTeam · Apr 13, 2012 · 87421e4 · 87421e4
2 parents b6d4c9f + 88a1557
commit 87421e4
Show file tree

Hide file tree

Showing 44 changed files with 7,114 additions and 59 deletions.
diff --git a/Rythem.pro b/Rythem.pro
@@ -26,7 +26,17 @@ SOURCES += main.cpp\
     proxy/rywinhttp.cpp \
     proxy/ryproxyserver.cpp \
     proxy/rypipedata.cpp \
-    proxy/ryconnection.cpp
+    proxy/ryconnection.cpp \
+    ryconnectiontableview.cpp \
+    quazip/zip.c \
+    quazip/unzip.c \
+    quazip/quazipnewinfo.cpp \
+    quazip/quazipfile.cpp \
+    quazip/quazip.cpp \
+    quazip/quacrc32.cpp \
+    quazip/quaadler32.cpp \
+    quazip/qioapi.cpp \
+    quazip/JlCompress.cpp
 
 mac:SOURCES -= qiwinhttp.cpp
 
@@ -44,7 +54,22 @@ HEADERS  += mainwindow.h \
     proxy/rywinhttp.h \
     proxy/ryproxyserver.h \
     proxy/rypipedata.h \
-    proxy/ryconnection.h
+    proxy/ryconnection.h \
+    ryconnectiontableview.h \
+    quazip/zip.h \
+    quazip/unzip.h \
+    quazip/quazipnewinfo.h \
+    quazip/quazipfileinfo.h \
+    quazip/quazipfile.h \
+    quazip/quazip.h \
+    quazip/quazip_global.h \
+    quazip/quacrc32.h \
+    quazip/quachecksum32.h \
+    quazip/quaadler32.h \
+    quazip/JlCompress.h \
+    quazip/ioapi.h \
+    quazip/crypt.h \
+    rymimedata.h
 win32:HEADERS += zlib/zutil.h \
     zlib/zlib.h \
     zlib/zconf.h \
@@ -92,8 +117,7 @@ OTHER_FILES += \
     static/icloud_64.png \
     RythemTimes/lib/parseuri.js \
     RythemTimes/lib/jo2.js \
-    RythemTimes/lib/jo2.dom.js \
+    RythemTimes/lib/jo2.dom.js
-    logo.rc
 CONFIG(release){
     #DEFINES += DEBUGTOFILE
     #message("debug")

diff --git a/composer.cpp b/composer.cpp
@@ -1,6 +1,9 @@
 #include "composer.h"
 #include "ui_composer.h"
 #include <QNetworkProxy>
+
+#include "rymimedata.h"
+
 Composer::Composer(QWidget *parent) :
     QWidget(parent),
     ui(new Ui::Composer){
@@ -177,6 +180,7 @@ void Composer::setupProxy(QString host,qint16 port){
 }
 
 void Composer::dragEnterEvent(QDragEnterEvent *event){
+
     qDebug()<<"drag enter";
     if (event->mimeData()->hasText()) {
         if (event->source() == this) {
@@ -188,12 +192,18 @@ void Composer::dragEnterEvent(QDragEnterEvent *event){
     } else {
         event->ignore();
     }
+
 }
 
 void Composer::dropEvent(QDropEvent *event){
-    qDebug()<<event->source();
+    qDebug()<<"drop";
-    if (event->mimeData()->hasText()) {
+    const RyMimeData* mime = dynamic_cast<const RyMimeData*>(event->mimeData());
-        const QMimeData *mime = event->mimeData();
+
+    if (mime) {
+        RyPipeData_ptr d = mime->pipeData();
+        this->ui->server->setText(d->host);
+        this->ui->port->setText(QString::number(d->port));
+        this->ui->request->setPlainText(QString(d->requestHeaderRawData()).append("\r\n\r\n").append(d->requestBodyRawData()));
         qDebug()<<"drop text="<<mime->text();
         event->acceptProposedAction();
     } else {

diff --git a/composer.ui b/composer.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>624</width>
+    <width>727</width>
     <height>385</height>
    </rect>
   </property>
@@ -22,6 +22,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="acceptDrops">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>w.l.qq.com</string>
      </property>
@@ -50,6 +53,9 @@
        <height>16777215</height>
       </size>
      </property>
+     <property name="acceptDrops">
+      <bool>false</bool>
+     </property>
      <property name="text">
       <string>80</string>
      </property>
@@ -101,6 +107,9 @@
    </item>
    <item row="1" column="0" colspan="6">
     <widget class="QPlainTextEdit" name="request">
+     <property name="acceptDrops">
+      <bool>false</bool>
+     </property>
      <property name="toolTip">
       <string>request</string>
      </property>
@@ -126,6 +135,9 @@ Range: bytes=48-6116217
    </item>
    <item row="2" column="0" colspan="6">
     <widget class="QPlainTextEdit" name="response">
+     <property name="acceptDrops">
+      <bool>false</bool>
+     </property>
      <property name="toolTip">
       <string>response</string>
      </property>

diff --git a/httpfiles.qrc b/httpfiles.qrc
@@ -23,5 +23,8 @@
         <file>static/icloud_64.png</file>
         <file>logo.png</file>
         <file>family.png</file>
+        <file>915.png</file>
+        <file>201111291315331602.png</file>
+        <file>201111291315335930.png</file>
     </qresource>
 </RCC>
diff --git a/logo.rc b/logo.rc
@@ -0,0 +1 @@
+IDI_ICON1               ICON    DISCARDABLE     "lol.ico"
diff --git a/lol.ico b/lol.ico
diff --git a/main.cpp b/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char *argv[])
 {
 	QApplication a(argc, argv);
     a.setQuitOnLastWindowClosed(false);
-    a.setWindowIcon(QIcon(":/static/logo.png"));
+    //a.setWindowIcon(QIcon(":/static/rythem.icns"));
     appPath =  qApp->applicationDirPath();
 
 
@@ -79,8 +79,8 @@ int main(int argc, char *argv[])
     server->connect(server,SIGNAL(pipeError(RyPipeData_ptr)),&w,SLOT(onPipeUpdate(RyPipeData_ptr)));
     server->listen(QHostAddress("127.0.0.1"),8889);
 
-    w.showMaximized();
+    //w.showMaximized();
-
+    w.show();
     return a.exec();
 
 }
diff --git a/mainwindow.cpp b/mainwindow.cpp
@@ -37,6 +37,8 @@
 #include <QMovie>
 #include <QPixmap>
 
+#include <quazip/quazip.h>
+#include <quazip/quazipfile.h>
 
 
 QByteArray gzipDecompress(QByteArray data){
@@ -219,15 +221,65 @@ MainWindow::~MainWindow()
 }
 void MainWindow::createMenus(){
     fileMenu = menuBar()->addMenu(tr("&File"));
-    captureAct = new QAction(tr("&Capture"),this);
+    QAction *importSessions = fileMenu->addAction(tr("&import session..."));
-    captureAct->setCheckable(true);
+    connect(importSessions,SIGNAL(triggered()),SLOT(importSessions()));
-    fileMenu->addAction(captureAct);
-    QAction *a = fileMenu->addAction(tr("&rules"));
-    connect(a,SIGNAL(triggered()),SLOT(showSettingsDialog()));
-    connect(captureAct,SIGNAL(triggered()),SLOT(toggleCapture()));
 }
 
-void MainWindow::showSettingsDialog(){
+void MainWindow::importSessions(){
+    QFileDialog dialog;
+    QString fileName = dialog.getOpenFileName(this,tr("select file to open"),"","Archiev Files(*.saz *.zip)");
+    QuaZip zip(fileName);
+    if(!zip.open(QuaZip::mdUnzip)){
+        qDebug()<<"cannot open "<<fileName;
+        return;
+    }
+    QuaZipFileInfo info;
+    QuaZipFile file(&zip);
+
+    RyPipeData_ptr pipeData;
+
+    QString name;
+    for (bool more = zip.goToFirstFile(); more; more = zip.goToNextFile()) {
+
+        if (!zip.getCurrentFileInfo(&info)) {
+            qWarning("testRead(): getCurrentFileInfo(): %d\n", zip.getZipError());
+            return;
+        }
+
+        if (!file.open(QIODevice::ReadOnly)) {
+            qWarning("testRead(): file.open(): %d", file.getZipError());
+            return;
+        }
+
+        name = file.getActualFileName();
+        QByteArray ba = file.readAll();
+        if(name.endsWith("_c.txt")){
+            //pipeData.clear();
+            pipeData = RyPipeData_ptr(new RyPipeData(0,0));
+            pipeData->isImported = true;
+            pipeData->parseRequest(&ba);
+            onNewPipe(pipeData);
+        }else if(name.endsWith("_s.txt")){
+            pipeData->parseResponse(&ba);
+            onPipeUpdate(pipeData);
+            pipeData.clear();
+        }
+
+        if (file.getZipError() != UNZ_OK) {
+            qWarning("testRead(): file.getFileName(): %d", file.getZipError());
+            return ;
+        }
+
+        file.close();
+
+        if (file.getZipError() != UNZ_OK) {
+            qWarning("testRead(): file.close(): %d", file.getZipError());
+            return ;
+        }
+
+    }
+
+    zip.close();
 
 }
 
@@ -345,27 +397,6 @@ void MainWindow::onWaterfallActionTriggered(){
 }
 
 
-void MainWindow::mousePressEvent(QMouseEvent *event){
-    qDebug()<<"mouseenter";
-    QTableView *table = static_cast<QTableView*>(childAt(event->pos()));
-    if (!table || table!=ui->tableView){
-        return;
-    }
-    qDebug()<<"is table";
-    QPoint hotSpot = event->pos() - table->pos();
-    QMimeData *mimeData = new QMimeData;
-    mimeData->setText("child->text()");
-    QDrag *drag = new QDrag(this);
-    drag->setMimeData(mimeData);
-    //drag->setPixmap(pixmap);
-    drag->setHotSpot(hotSpot);
-    drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
-}
-
-void MainWindow::dragEnterEvent(QDragEnterEvent *){
-
-}
-
 void MainWindow::toggleProxy(){
     if(isUsingCapture){
         isUsingCapture = false;
@@ -428,7 +459,7 @@ void MainWindow::toggleProxy(){
 }
 
 void MainWindow::toggleCapture(){
-    captureAct->setChecked(!isUsingCapture);
+    //captureAct->setChecked(!isUsingCapture);
 #ifdef Q_WS_WIN32
     RyWinHttp::init();
     toggleProxy();

diff --git a/mainwindow.h b/mainwindow.h
@@ -46,7 +46,7 @@ class MainWindow : public QMainWindow
 
 private slots:
         void toggleCapture();
-        void showSettingsDialog();
+        void importSessions();
 public:
     explicit MainWindow(QWidget *parent=0);
     ~MainWindow();
@@ -70,9 +70,6 @@ public slots:
 	}ProxyInfo;
     RyTableModel pipeTableModel;
 
-protected:
-        void mousePressEvent(QMouseEvent *);
-        void dragEnterEvent(QDragEnterEvent *);
 
 private:
     Ui::MainWindow *ui;

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -13,21 +13,23 @@
   <property name="windowTitle">
    <string>Rythem</string>
   </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>logo.png</normaloff>logo.png</iconset>
-  </property>
   <widget class="QWidget" name="centralWidget">
    <layout class="QHBoxLayout" name="horizontalLayout">
     <item>
      <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QTableView" name="tableView"/>
+      <widget class="RyConnectionTableView" name="tableView"/>
       <widget class="QTabWidget" name="tollTabs">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Ignored" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="currentIndex">
-        <number>0</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="inspectorTab">
         <attribute name="title">
@@ -88,8 +90,8 @@
                   <rect>
                    <x>0</x>
                    <y>0</y>
-                   <width>557</width>
+                   <width>98</width>
-                   <height>195</height>
+                   <height>40</height>
                   </rect>
                  </property>
                  <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -153,7 +155,7 @@
      <x>0</x>
      <y>0</y>
      <width>818</width>
-     <height>23</height>
+     <height>22</height>
     </rect>
    </property>
   </widget>
@@ -241,6 +243,11 @@
    <header>composer.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>RyConnectionTableView</class>
+   <extends>QTableView</extends>
+   <header>ryconnectiontableview.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="httpfiles.qrc"/>

diff --git a/proxy/rypipedata.cpp b/proxy/rypipedata.cpp
@@ -10,6 +10,8 @@ RyPipeData::RyPipeData(int _socketHandle,quint64 connectionId,QObject *parent):
     socketConnectionId = connectionId;
     _isContentLenthUnLimit =false;
     _isResponseChunked = false;
+    isMatchingRule = false;
+    isImported = false;
 }
 
 bool RyPipeData::operator <(RyPipeData &pipeData){

diff --git a/proxy/rypipedata.h b/proxy/rypipedata.h
@@ -116,6 +116,7 @@ class RyPipeData : public QObject
         QString getResponseHeader(const QString& name)const;
 
         bool isMatchingRule;
+        bool isImported;
         int ruleType;
 
         QByteArray requestHeaderRawData()const{